From a2df1324fcd012b427bb2e20b6b9ea67ad4de2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Wed, 26 Oct 2022 00:12:14 +0000
Subject: [PATCH 1/3] Set displaycolor platform variable to gs201.

Bug: 241708558
Test: presubmit
Change-Id: I482707e95c4b00b5b18bae18dae9b2cfb666a45e
Merged-In: I482707e95c4b00b5b18bae18dae9b2cfb666a45e
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 44ac8470..ee59dd35 100644
--- a/device.mk
+++ b/device.mk
@@ -809,6 +809,7 @@ PRODUCT_PACKAGES += \
 #PRODUCT_PACKAGES += \
 #	trusty_metricsd
 
+$(call soong_config_set,google_displaycolor,displaycolor_platform,gs201)
 PRODUCT_PACKAGES += \
 	android.hardware.composer.hwc3-service.pixel \
 	libdisplaycolor

From 4ac953829df52e34ad0724618e95ce6b785abe9b Mon Sep 17 00:00:00 2001
From: Ruofei Ma <ruofeim@google.com>
Date: Tue, 18 Oct 2022 17:31:38 +0000
Subject: [PATCH 2/3] update performance-point for AV1 decoder

Use the solution mentioned in b/254207680 to solve the issue
where 180fps might not be picked up in some test cases.

Bug: 254207680

Test: MultiDecoderPairPerfTest
Test: MultiDecoderPerfTest
Test: android.media.misc.cts.MediaCodecListTest
Test: android.video.cts.CodecDecoderPerformanceTest

Signed-off-by: Ruofei Ma <ruofeim@google.com>
Change-Id: Ib6c0b4b37a981dc0ffd27aef18614d40fd3603a9
---
 media_codecs_bo_c2.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 7830b9c9..b57a92aa 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -26,7 +26,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" value="180" />
+          <Limit name="performance-point-1920x1079" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
         </MediaCodec>
@@ -39,7 +40,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" value="180" />
+          <Limit name="performance-point-1920x1079" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
           <Feature name="secure-playback" required="true" />

From edf708ad6207b9e7f50b38e6dd1ad6495540a0c5 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Wed, 19 Oct 2022 16:13:22 +0800
Subject: [PATCH 3/3] Revert "init: support boot.charger_mode feature"

This reverts commit 89d34d5ef9ac6c1ceedaadc4e00cab61fa819551.

Reason for revert: no longer needed.

Bug: 251680171
Test: manually
Change-Id: I9fe68a2c278e61027172eda90508726fef361678
---
 conf/init.gs201.rc | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index a07a3d73..9694debe 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -309,9 +309,6 @@ on init
     # Disable dock-defend by default
     chown system system /sys/devices/platform/google,charger/dd_settings
     write /sys/devices/platform/google,charger/dd_settings -1
-    # Enable charger mode (aka off-mode charging) by default
-    chown system system /sys/class/power_supply/battery/charger_mode
-    write /sys/class/power_supply/battery/charger_mode 1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
@@ -858,14 +855,6 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
-# Clear the state of charger_mode
-on property:persist.vendor.charger_mode.enable=1
-    write /sys/class/power_supply/battery/charger_mode 0
-
-# Enable charger_mode when user triggers shutdown from menu
-on property:sys.shutdown.requested=0userrequested
-    write /sys/class/power_supply/battery/charger_mode 1
-
 # on userdebug and eng builds, enable scsi error recovery log
 on property:ro.debuggable=1
     write /sys/module/scsi_mod/parameters/scsi_logging_level 63