From 7847851d6c40f6ee85801b7e4a1249c8e1ab1531 Mon Sep 17 00:00:00 2001
From: Sungtak Lee <taklee@google.com>
Date: Tue, 27 Feb 2024 16:59:35 +0000
Subject: [PATCH 1/3] Enable AIDL media.c2

Bug: 321808716
Change-Id: I2c2d7d3d7539a65aa82125ab13f1498c6defdebf
---
 device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device.mk b/device.mk
index e3818ced..eaf4dce6 100644
--- a/device.mk
+++ b/device.mk
@@ -787,6 +787,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \
 
+PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
+
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
 	device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \

From 2c344ad3fa4c314a002c6cbb52d367485663e487 Mon Sep 17 00:00:00 2001
From: Martin Liu <liumartin@google.com>
Date: Thu, 18 Apr 2024 03:49:46 +0000
Subject: [PATCH 2/3] move common MM settings to gs common folder

Bug: 332916849
Bug: 309409009
Test: boot
Change-Id: If5515f107b4fb2490d83c2d48c78727bd6f2e51f
Signed-off-by: Martin Liu <liumartin@google.com>
---
 conf/init.zuma.rc                                      | 6 ------
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 99efd046..4ee0ece7 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -106,12 +106,6 @@ on init
     write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
 
-    # adjust PCP high level
-    write /proc/sys/vm/percpu_pagelist_high_fraction 430
-
-    # disable proactive compaction
-    write /proc/sys/vm/compaction_proactiveness 0
-
     # Some user code relies on ro.boot.hardware.revision
     setprop ro.boot.hardware.revision ${ro.revision}
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 921b7522..995fcfa5 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -74,6 +74,9 @@
     <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
     <bool name="config_unplugTurnsOnScreen">true</bool>
 
+
+    <bool name="config_use_tiered_cached_adj">false</bool>
+
     <!-- If device supports pickup/lift gesture -->
     <bool name="config_dozePulsePickup">true</bool>
 

From 4f00775b4ef4b34799373538b0c07ffd202abd30 Mon Sep 17 00:00:00 2001
From: Priyanka Advani <padvani@google.com>
Date: Fri, 19 Apr 2024 20:44:19 +0000
Subject: [PATCH 3/3] Revert "Enable AIDL media.c2"

Revert submission 26384060-c2aidl-pixel-enable

Reason for revert: Culprit for b/335892284. Will be verifying through ABTD for confirmation and before submitting the revert.

Reverted changes: /q/submissionid:26384060-c2aidl-pixel-enable

Change-Id: I7b331a48f64b89a19fcedeeae783fe8fc83c22c2
---
 device.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/device.mk b/device.mk
index eaf4dce6..e3818ced 100644
--- a/device.mk
+++ b/device.mk
@@ -787,8 +787,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \
 
-PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
-
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
 	device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \