From 507675bc2c7738f067b5b410cfeb5c7c9ad1dade Mon Sep 17 00:00:00 2001
From: Ankit Goyal <layog@google.com>
Date: Wed, 28 Aug 2024 22:56:25 -0700
Subject: [PATCH 1/3] Delete mapper4 manifest

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

diff --git a/manifest.xml b/manifest.xml
index 69a1bcdd..5728c90b 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 e739e3b25408b6ea1823321ef1efc54cd9427a25 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Thu, 29 Aug 2024 14:32:33 +0000
Subject: [PATCH 2/3] 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: I892b99b79ff2dd9c02cc874026b43b06bded6f59
---
 conf/init.zuma.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 8bc0b76d..a5005e94 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -742,9 +742,9 @@ on property:sys.boot_completed=1
     write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
 
     # Restore prefer idle
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x1ff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x1ff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x1ff
+    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/fg/preferred_idle_mask_low 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0x1ff

From 75edad5f451a33015483bafd747fa9f12cc327dc Mon Sep 17 00:00:00 2001
From: kellyhung <kellyhung@google.com>
Date: Fri, 23 Aug 2024 13:07:30 +0800
Subject: [PATCH 3/3] Add soong config use_google_qns in
 device/google/zuma/device.mk

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

diff --git a/device.mk b/device.mk
index 2e3f7712..71a9da30 100644
--- a/device.mk
+++ b/device.mk
@@ -232,6 +232,7 @@ USE_LASSEN_OEMHOOK := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
     $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
     PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
+    $(call soong_config_set,grilservice,use_google_qns,true)
 endif
 
 # Use for GRIL