From bcf7f4be238091973430018be39324b56c1e6281 Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Wed, 28 Aug 2024 09:19:49 +0000
Subject: [PATCH 1/4] Set permission for local_hbm_delay_frames

Bug: 362149568
Test: enroll and authenticate fingerprint
Change-Id: I84555689be95f0e0e8d8f1b8b154be438a9483f1
---
 conf/init.zumapro.board.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index 2fc685f..9866297 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -392,6 +392,7 @@ on fs
     chown system system /sys/class/backlight/panel0-backlight/dimming_on
     chown system system /sys/class/backlight/panel0-backlight/hbm_mode
     chown system system /sys/class/backlight/panel0-backlight/local_hbm_mode
+    chown system system /sys/class/backlight/panel0-backlight/local_hbm_delay_frames
     chown system system /sys/devices/platform/exynos-drm/primary-panel/gamma
     chown system system /sys/devices/platform/exynos-drm/primary-panel/min_vrefresh
     chown system system /sys/devices/platform/exynos-drm/primary-panel/idle_delay_ms

From ee8b790ce0f921223f3e7f10626c6d3d541d0541 Mon Sep 17 00:00:00 2001
From: Ankit Goyal <layog@google.com>
Date: Wed, 28 Aug 2024 22:56:42 -0700
Subject: [PATCH 2/4] Delete mapper4 manifest

Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: I8bc3af1f566e649373aefd12de82ae1195681eb5
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 69a1bcd..5728c90 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device" target-level="8">
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>

From 53452df2c5acf162582656d3be42141da7f48347 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Thu, 29 Aug 2024 14:28:14 +0000
Subject: [PATCH 3/4] Restore preferred_idle_mask to the default setting

The preferred_idle_mask is changed during boot time, but it does not
restore to the default setitng as in powerhint, so some node may keep
the wrong value when framework restarts.

Bug: 248621289
Test: build pass
Flag: NONE init rc file change does not support flags
Change-Id: Ib11681b9a751b1d67d02e9788d888e515d5a3519
---
 conf/init.zumapro.soc.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc
index ef3dbab..ec0f6bc 100644
--- a/conf/init.zumapro.soc.rc
+++ b/conf/init.zumapro.soc.rc
@@ -181,9 +181,9 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_mm/kcompactd_cpu_affinity 7f
 
     # Restore prefer idle
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x7f
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x7f
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x7f
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0xff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0xff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0xff

From cd60c30befc0455e1ef8a8c65934f952280a089e Mon Sep 17 00:00:00 2001
From: kellyhung <kellyhung@google.com>
Date: Fri, 23 Aug 2024 13:08:28 +0800
Subject: [PATCH 4/4] Add soong config use_google_qns in
 device/google/zumapro/device.mk

Bug: 360757079
Test: lunch r11-trunk_staging-userdebug; m grilservice
Flag: EXEMPT bugfix
Change-Id: I3254d83d0aadc403cb6ce6470e601cf336957319
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index fdeef21..9745338 100644
--- a/device.mk
+++ b/device.mk
@@ -224,6 +224,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
 # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
 PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
 $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
+$(call soong_config_set,grilservice,use_google_qns,true)
 
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)