From 03ae83d4e6d83e782f917369fe74ccc95779997e Mon Sep 17 00:00:00 2001
From: Wilson Wu <wilsonwu@google.com>
Date: Tue, 15 Aug 2023 04:24:18 +0000
Subject: [PATCH 1/3] Support variable refresh rate when typing on zuma

Enable config_variableRefreshRateTypingSupported
for zuma devices.

Bug: 283055450
Test: build
Change-Id: I695b48392fc134735705f05f74a854fbfaac108c
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f74c3b5b..73ba0830 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -284,4 +284,7 @@
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- Enable variable refresh rate when typing. -->
+    <bool name="config_variableRefreshRateTypingSupported">true</bool>
 </resources>

From 97cd05816bf797f37759406581bbc55db45bbab4 Mon Sep 17 00:00:00 2001
From: Jyun LuoLai <jyunluolai@google.com>
Date: Mon, 28 Aug 2023 09:49:55 +0800
Subject: [PATCH 2/3] Add READ_PHONE_STATE for dcservice

For the Clear calling logging

Bug: 293811206
TESTED=Manual

Change-Id: Ifd996542ef3f64cda754ed88deabd72c79f12191
---
 default-permissions.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 613f4231..0918a74c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -137,5 +137,9 @@
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="true"/>
     </exception>
+    <exception package="com.google.android.apps.pixel.dcservice">
+        <!-- Phone state for Clear Calling logging -->
+        <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
+    </exception>
 </exceptions>
 

From dd0e6d0efdecfa4da0f67e2803e664d54515b75f Mon Sep 17 00:00:00 2001
From: Speth Chang <spethchang@google.com>
Date: Mon, 28 Aug 2023 15:24:31 +0800
Subject: [PATCH 3/3] Disable multicam sync on FATP build

Bug: 297000091
Test: Build pass
Change-Id: Ieda421114fc2584aa1dff194661202531f7ebb65
---
 factory_common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/factory_common.mk b/factory_common.mk
index a58eaf17..a33f5129 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -31,6 +31,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 # Disable camera related features for factory builds
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.af.ignore_gyro=1 \
+    persist.vendor.camera.multicam.framesync=0 \
     vendor.camera.debug.bypass_face_ssd_processor=1 \
     vendor.camera.debug.csi_ebuf_enable=0 \
     vendor.camera.debug.enable_face_detection=0 \