From 3df55604f52866b77a4e7b51ce701c952cea34f4 Mon Sep 17 00:00:00 2001
From: millerliang <millerliang@google.com>
Date: Wed, 1 Jun 2022 21:05:31 +0800
Subject: [PATCH 1/3] audio: adjust the latency for compress-offload

Compress-offload also needs to adjust the latency
to meet the av sync result.

Bug: 234104918
Test: Play AV sync video in YTMusic test apk
Change-Id: I45e4b2d2c477ae2eae14d7342e3a81c38ec61cb4
---
 audio/cheetah/config/audio_platform_configuration.xml | 7 +++++++
 audio/panther/config/audio_platform_configuration.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index f5356bb..c954366 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -217,6 +217,13 @@
             <be_cfg be_id="OUT_A2DP_BE_CFG" latency="180000"/>
         </usecase>
 
+        <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" type="playback">
+            <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="70000"/>
+        </usecase>
+
         <usecase id="UC_AUDIO_RECORD" type="capture">
             <be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index f5356bb..c954366 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -217,6 +217,13 @@
             <be_cfg be_id="OUT_A2DP_BE_CFG" latency="180000"/>
         </usecase>
 
+        <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" type="playback">
+            <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="40000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="70000"/>
+        </usecase>
+
         <usecase id="UC_AUDIO_RECORD" type="capture">
             <be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>

From 79753e6c351d43eee29ca60975f3886b973dfc81 Mon Sep 17 00:00:00 2001
From: George Lee <geolee@google.com>
Date: Tue, 7 Jun 2022 09:46:43 -0700
Subject: [PATCH 2/3] thermal: Remove PassiveDelay for VDROOP1/2/BATOILO

Part of removing monitoring of BCL thermal zones.

Bug: 234901714
Test: Boot and confirm settings
Signed-off-by: George Lee <geolee@google.com>
Change-Id: I470951a6a8676079642c7070687198645a163887
---
 thermal_info_config_cheetah.json   | 13 +------------
 thermal_info_config_panther.json   | 10 ----------
 thermal_info_config_ravenclaw.json | 10 ----------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index b12b655..d82a559 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -386,7 +386,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -405,7 +404,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -424,7 +422,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -443,7 +440,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -462,7 +458,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -484,7 +479,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -498,7 +492,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -532,7 +525,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -554,7 +546,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -576,7 +567,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -634,8 +624,7 @@
             "Type":"BCL_CURRENT",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true
+            "Multiplier":1
         },
         {
             "Name":"soft_ocp_tpu",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 3419f92..442d2e9 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -387,7 +387,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -406,7 +405,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -425,7 +423,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -444,7 +441,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -463,7 +459,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -485,7 +480,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -499,7 +493,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -533,7 +526,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -555,7 +547,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -577,7 +568,6 @@
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index 8d0611a..d61f670 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -176,7 +176,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -210,7 +209,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -246,7 +244,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -282,7 +279,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -316,7 +312,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -350,7 +345,6 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "tpu_cooling",
@@ -381,7 +375,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -447,7 +440,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -486,7 +478,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -525,7 +516,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PassiveDelay":500,
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-cpufreq-2",

From 9d342cabbec9abca8fad94eb8211ab062c6d5154 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 6 Jun 2022 16:51:52 +0000
Subject: [PATCH 3/3] Update longpress time on lock icon to 100ms

Test: manual
Bug: 231712181
Change-Id: I0a9faf86b690399d7bc901e0fc8f72f9f7435b63
---
 .../frameworks/base/packages/SystemUI/res/values/config.xml    | 3 +++
 .../frameworks/base/packages/SystemUI/res/values/config.xml    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index c292f1d..949a402 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -63,5 +63,8 @@
     <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
 
     <bool name="config_enableDisplayCutoutProtection">true</bool>
+
+    <!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
+    <integer name="config_lockIconLongPress" translatable="false">100</integer>
 </resources>
 
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index ebaa70a..e49259d 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -69,5 +69,8 @@
     <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
 
     <bool name="config_enableDisplayCutoutProtection">true</bool>
+
+    <!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
+    <integer name="config_lockIconLongPress" translatable="false">100</integer>
 </resources>