From c99aafcbc972ae5f3dadb4a3afd96dc2ce3a7826 Mon Sep 17 00:00:00 2001
From: chungkai <chungkai@google.com>
Date: Tue, 29 Mar 2022 10:18:53 +0000
Subject: [PATCH 1/3] init: add uclamp threshold setting

To filter tiny task, add uclamp threshold setting

Test: build and boot pass
Bug: 214098855
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I20c7d5228b81b9ef27660f5b4d120b3c4c584276
---
 conf/init.gs101.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 72a292cf..0b5873c9 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -727,6 +727,7 @@ on property:sys.boot_completed=1
     setprop vendor.powerhal.init 1
 
     # Setup final cpu.uclamp
+    write /proc/vendor_sched/uclamp_threshold 8
     write /proc/vendor_sched/ta_uclamp_min 1
     write /proc/vendor_sched/fg_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0

From 0be3bbd0835b41ddf7a9d265b8b35b08ef9781ca Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Mon, 28 Mar 2022 21:01:16 +0800
Subject: [PATCH 2/3] powerstats: set time limit as timeout for AoC

Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I9a9eb27fab549f4351bcfae6e335e050c48fc753
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/Gs101CommonDataProviders.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp
index 13e6b71f..124177ca 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs101CommonDataProviders.cpp
@@ -45,6 +45,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 constexpr char kBootHwSoCRev[] = "ro.boot.hw.soc.rev";
 
 void addAoC(std::shared_ptr<PowerStats> p) {
+    static const uint64_t TIMEOUT_MILLIS = 120;
     std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
 
     // Add AoC cores (a32, ff1, hf0, and hf1)
@@ -57,7 +58,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
     std::vector<std::pair<std::string, std::string>> coreStates = {
             {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
     p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
-            coreStates));
+            coreStates, TIMEOUT_MILLIS));
 
     // Add AoC voltage stats
     std::vector<std::pair<std::string, std::string>> voltageIds = {
@@ -68,7 +69,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
                                                                       {"UUD", "ultra_underdrive"},
                                                                       {"UD", "underdrive"}};
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
+            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates,
+                    TIMEOUT_MILLIS));
 
     // Add AoC monitor mode
     std::vector<std::pair<std::string, std::string>> monitorIds = {
@@ -78,7 +80,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
             {"MON", "mode"},
     };
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
+            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates,
+                    TIMEOUT_MILLIS));
 
     // Add AoC restart count
     const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {

From 2dc3c4cb185509c048d60007d0e5cc41b53a4e74 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Wed, 30 Mar 2022 16:11:18 +0000
Subject: [PATCH 3/3] Revert "[automerge] Disable spatial audio feature 2p:
 68f33d6043 am: 95c69ea86e"

This reverts commit 661813569009bcb74a69a654578aae5bbdc1eb58.

Reason for revert: Spatial audio demo

Change-Id: Ie44a31102cc6e335eaf922fa7c42c944a60b0920
---
 device.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index dc6ebb8e..cc3ebc7a 100644
--- a/device.mk
+++ b/device.mk
@@ -1042,9 +1042,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.audio.monitorRotation = true \
 	ro.audio.offload_wakelock=false
 
-# declare use of spatial audio
-# PRODUCT_PROPERTY_OVERRIDES += \
-#	ro.audio.spatializer_enabled=true
+# DO NOT SUBMIT declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
 
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # IAudioMetricExt HIDL