From 106dbcf1d0260120d1a65345710099630f3a592c Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Thu, 19 Sep 2024 02:57:43 +0000
Subject: [PATCH 1/2] audio: add uninisialized mixer control

Bug: 362904466
Test: mm
Flag: build.RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA
Change-Id: I29c18e1c6433aebfd4e8760ccb8f184708c41b06
---
 audio/husky/aidl_config/mixer_paths_aidl.xml | 1 +
 audio/shiba/aidl_config/mixer_paths_aidl.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 9c8ccf6..d970e8e 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -233,6 +233,7 @@
   <ctl name="EP6 TX Mixer INCALL_TX" value="0" />
   <ctl name="NoHost1 TX Mixer INCALL_TX" value="0" />
 
+  <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
   <ctl name="EP4 TX Mixer I2S_2_TX" value="0" />
 
   <!-- AoC Mic setting -->
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 9c8ccf6..d970e8e 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -233,6 +233,7 @@
   <ctl name="EP6 TX Mixer INCALL_TX" value="0" />
   <ctl name="NoHost1 TX Mixer INCALL_TX" value="0" />
 
+  <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
   <ctl name="EP4 TX Mixer I2S_2_TX" value="0" />
 
   <!-- AoC Mic setting -->

From 449e58e874a14603386b71b2fd4ebda568323ce6 Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Fri, 20 Sep 2024 06:13:05 +0000
Subject: [PATCH 2/2] display: update reduceBrightColorsStrength setting

Bug: 353768636
Test: dumpsys color_display
Flag: NONE config update
Change-Id: I977fa738050ae90d6f0cf7d0bb5d1f5a006ab696
---
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index c37151b..893d3ba 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+    <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
     <!-- If this is true, the udfps vote is ignored. -->
     <bool name="config_ignoreUdfpsVote">true</bool>
 
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index 5128d0d..fcbbc46 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+    <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.  -->
     <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>