From b2276fb72d58da1d7c79e677edbaed4fe9b89a0c Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Fri, 22 Jul 2022 10:07:47 -0700
Subject: [PATCH 1/4] Revert "thermal: remove gxp cooling device dependency"

This reverts commit af3528b9034a5e590ec1017f9f4b6be4a31d46bb.

Re-enable gxp cooling device

Bug: 238273184
Test: Build and boot on device
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: I6e7eac3f8b15fffccbf64c80f8af7866b9397e4f
Merged-In: I6e7eac3f8b15fffccbf64c80f8af7866b9397e4f
---
 thermal_info_config_cheetah.json | 9 +++++++++
 thermal_info_config_panther.json | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 200db05..db7f985 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -129,6 +129,10 @@
                 {
                     "CdevRequest": "tpu_cooling",
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
                 }
             ]
         },
@@ -754,6 +758,11 @@
             "Name":"tpu_cooling",
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
+        },
+        {
+            "Name":"gxp-cooling",
+            "Type":"NPU",
+            "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote"
         }
     ],
     "PowerRails":[
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 66982e8..57174cf 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -129,6 +129,10 @@
                 {
                     "CdevRequest": "tpu_cooling",
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
                 }
             ]
         },
@@ -755,6 +759,11 @@
             "Name":"tpu_cooling",
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
+        },
+        {
+            "Name":"gxp-cooling",
+            "Type":"NPU",
+            "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote"
         }
     ],
     "PowerRails":[

From 6262c7c94566b0b9cf61684e8033165ad7fb881a Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Mon, 12 Sep 2022 16:59:00 -0700
Subject: [PATCH 2/4] c10: remove unused udfps_illumination_transition_ms

Bug: 243818429
Test: N/A
Change-Id: I1ef0a67006d57cafa2e7a74c70b0cd176a094c2d
Merged-In: I1ef0a67006d57cafa2e7a74c70b0cd176a094c2d
---
 .../overlay/frameworks/base/core/res/res/values/config.xml   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 3c371ab..8143486 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -180,11 +180,6 @@
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
-    <!-- How long it takes for the HW to start illuminating after the illumination is requested.
-      It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 120 Hz screen
-      refresh rate equates to a 25 ms delay. -->
-    <integer name="config_udfps_illumination_transition_ms">25</integer>
-
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 

From 55fdb7f9238a5e8a330d68ac7e8bdb3822fe3b89 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Mon, 12 Sep 2022 16:55:22 -0700
Subject: [PATCH 3/4] p10: remove unused udfps_illumination_transition_ms

Bug: 243818429
Test: N/A
Change-Id: I198e4991e06951e0b324726649c9e967e8aac6fb
Merged-In: I198e4991e06951e0b324726649c9e967e8aac6fb
---
 .../overlay/frameworks/base/core/res/res/values/config.xml   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index f617337..9369361 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -202,11 +202,6 @@
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
-    <!-- How long it takes for the HW to start illuminating after the illumination is requested.
-      It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 90 Hz screen
-      refresh rate equates to a 34 ms delay. -->
-    <integer name="config_udfps_illumination_transition_ms">34</integer>
-
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 

From 4d0d8925d93d680c1770342705c36d13b95408f0 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Wed, 14 Sep 2022 03:26:56 +0000
Subject: [PATCH 4/4] audio: extand the period number of hifi usecase

extend this to prevent alsa trigger stop playback
and causing pop

Bug: 238056484
Signed-off-by: vincenttew <vincenttew@google.com>
Change-Id: I1c3e3f68aa63acbc520ddf5f758615c99f1ef9f8
---
 audio/cheetah/config/audio_platform_configuration.xml     | 4 ++--
 audio/cloudripper/config/audio_platform_configuration.xml | 4 ++--
 audio/panther/config/audio_platform_configuration.xml     | 4 ++--
 audio/ravenclaw/config/audio_platform_configuration.xml   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index 536b3fe..c729764 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -201,8 +201,8 @@
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
         <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
         <!-- for hifi -->
-        <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
-        <usecase id="UC_HIFI_RECORD" dev1="26"/>
+        <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/>
+        <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/>
     </usecase_attr>
 
     <dsp_latency>
diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml
index cd81fb7..337c1a8 100644
--- a/audio/cloudripper/config/audio_platform_configuration.xml
+++ b/audio/cloudripper/config/audio_platform_configuration.xml
@@ -199,8 +199,8 @@
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
         <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
         <!-- for hifi -->
-        <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
-        <usecase id="UC_HIFI_RECORD" dev1="26"/>
+        <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/>
+        <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/>
     </usecase_attr>
 
     <dsp_latency>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index 536b3fe..c729764 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -201,8 +201,8 @@
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
         <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
         <!-- for hifi -->
-        <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
-        <usecase id="UC_HIFI_RECORD" dev1="26"/>
+        <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/>
+        <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/>
     </usecase_attr>
 
     <dsp_latency>
diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml
index 748855e..532a66c 100644
--- a/audio/ravenclaw/config/audio_platform_configuration.xml
+++ b/audio/ravenclaw/config/audio_platform_configuration.xml
@@ -199,8 +199,8 @@
         <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
         <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
         <!-- for hifi -->
-        <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
-        <usecase id="UC_HIFI_RECORD" dev1="26"/>
+        <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/>
+        <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/>
     </usecase_attr>
 
     <dsp_latency>