From 1979e0bcf98c1129371e22713434dc2fad239d2a Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 16 Sep 2022 15:56:59 +0800
Subject: [PATCH 1/4] audio: remove CCA default setting from common

Bug: 248151108
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ia48b5ef5829cb347f79b555f8c5d3edfb13acff9
---
 device.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device.mk b/device.mk
index 06a0205a..9bcdfe11 100644
--- a/device.mk
+++ b/device.mk
@@ -1043,10 +1043,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
 	frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
 
-##Audio Vendor property
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.audio.cca.enabled=true
-
 ##Audio soong
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/whitechapel/audio/hal \

From 6e2913695d8a062d1b268c87cd456ed38b717c73 Mon Sep 17 00:00:00 2001
From: "Sean.JS Tsai" <seanjstsai@google.com>
Date: Tue, 23 Aug 2022 13:16:19 +0000
Subject: [PATCH 2/4] Add notification pregrant for WfcActivation

Bug: 241721849
Bug: 246485672

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

diff --git a/default-permissions.xml b/default-permissions.xml
index 748ede67..3e308ea9 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -116,6 +116,8 @@
     <exception package="com.google.android.wfcactivation">
         <!-- SMS -->
         <permission name="android.permission.RECEIVE_WAP_PUSH" fixed="false"/>
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.accessibility.voiceaccess">

From 6ef57bda3654f562a406d88779e37cdb8564d8d6 Mon Sep 17 00:00:00 2001
From: Jeremy Kemp <jeremykemp@google.com>
Date: Fri, 23 Sep 2022 13:42:50 +0100
Subject: [PATCH 3/4] GPU: Remove write to ifpo sysfs node.

As part of pa/2288829, this node becomes unsupported.

Prevents -ENOTSUPP errors when trying to write to Mali's ifpo sysfs
node.

Test: Boot to homescreen
Bug: 247571932
Change-Id: I0b579728a5b2a4355d648020113dda0592f904aa
Signed-off-by: Jeremy Kemp <jeremykemp@google.com>
---
 conf/init.gs201.rc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 69243c71..b8f86b55 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -796,9 +796,6 @@ on property:sys.boot_completed=1
     chown system system /sys/devices/platform/19000000.aoc/control/udfps_get_disp_freq
     chmod 440 /sys/devices/platform/19000000.aoc/control/udfps_get_disp_freq
 
-    # Enable GPU power optimization
-    write /sys/devices/platform/28000000.mali/ifpo 1
-
     # Disable GPU firmware logging
     write /sys/devices/platform/28000000.mali/firmware_config/Log\ verbosity/cur 0
 

From dd651b1bfec474cf54afbb033029741722ca2b63 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Sat, 20 Aug 2022 12:27:07 -0700
Subject: [PATCH 4/4] pixelstats: add thermal stats paths

Add thermal metrics paths in sysfs paths list

Bug: 228247740
Test: Build and boot on device
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: Ibcdef9a10dea7698cbb511015ea2835994ddbf89
---
 pixelstats/service.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 8578788b..83a46727 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -58,6 +58,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     },
     .BlockStatsLength = BLOCK_STATS_LENGTH,
     .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
+    .ThermalStatsPaths = {
+        "/sys/devices/platform/100a0000.BIG/trip_counter",
+        "/sys/devices/platform/100a0000.MID/trip_counter",
+        "/sys/devices/platform/100a0000.LITTLE/trip_counter",
+        "/sys/devices/platform/100b0000.G3D/trip_counter",
+        "/sys/devices/platform/100b0000.TPU/trip_counter",
+        "/sys/devices/platform/100b0000.AUR/trip_counter",
+    }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {