From a40a46cc833462e7fd98fa21b0a53840a0629b2d Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Wed, 27 Mar 2024 14:23:09 +0000
Subject: [PATCH 1/2] Screen Brightening/Darkening thresholds update

Bug: 327934902
test: dumpsys display
Change-Id: Ieceaf9c9f50ca31545400220a3b3ac07310112f6
---
 .../base/core/res/res/values/config.xml       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index ecfb1c9..53282f6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -416,6 +416,55 @@
           <item>2050</item>          <!-- 100000+  -->
      </array>
 
+    <!-- Array of screen brightness threshold values. This is used for determining hysteresis
+         constraint values by calculating the index to use for lookup and then setting the
+         constraint value to the corresponding value of the array. The new brightening hysteresis
+         constraint value is the n-th element of config_screenBrighteningThresholds, and the new
+         darkening hysteresis constraint value is the n-th element of
+         config_screenDarkeningThresholds.
+
+         Historically, it has been assumed that this will be an integer array with values in the
+         range of [0, 255]. However, it is now assumed to be a float array with values in the
+         range of [0, 1]. To accommodate both the possibilities, we internally check the scale on
+         which the thresholds are defined, and calibrate it accordingly.
+
+         The (zero-based) index is calculated as follows: (MAX is the largest index of the array)
+         condition                       calculated index
+         value < level[0]                0
+         level[n] <= value < level[n+1]  n+1
+         level[MAX] <= value             MAX+1 -->
+    <array name="config_screenThresholdLevels">
+        <item>0.5</item>
+        <item>0.6</item>
+        <item>0.9</item>
+    </array>
+
+    <!-- Array of hysteresis constraint values for brightening, represented as tenths of a
+         percent. The length of this array is assumed to be one greater than
+         config_screenThresholdLevels. The brightening threshold is calculated as
+         screenBrightness * (1.0f + CONSTRAINT_VALUE). When the new screen brightness is higher
+         than this threshold, it is applied. See the config_screenThresholdLevels description for
+         how the constraint value is chosen. -->
+    <integer-array name="config_screenBrighteningThresholds">
+        <item>100</item>
+        <item>100</item>
+        <item>40</item>
+        <item>10</item>
+    </integer-array>
+
+    <!-- Array of hysteresis constraint values for darkening, represented as tenths of a
+         percent. The length of this array is assumed to be one greater than
+         config_screenThresholdLevels. The darkening threshold is calculated as
+         screenBrightness * (1.0f - CONSTRAINT_VALUE). When the new screen brightness is lower than
+         this threshold, it is applied. See the config_screenThresholdLevels description for how
+         the constraint value is chosen. -->
+    <integer-array name="config_screenDarkeningThresholds">
+        <item>200</item>
+        <item>200</item>
+        <item>200</item>
+        <item>200</item>
+    </integer-array>
+
     <!-- The identifier of the satellite's SIM profile. The identifier is composed of MCC and MNC
          of the satellite PLMN with the format "mccmnc". -->
     <string name="config_satellite_sim_plmn_identifier">90198</string>

From 909711bbdfd4f768e917b4570665ff83d9594ebc Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Tue, 30 Apr 2024 09:07:23 +0000
Subject: [PATCH 2/2] audio: add debug interface soong value

note: Using the flag to filter all debugging
      purpose interface from the build.

Test: build pass
Bug: 332490210
Change-Id: I06a8048c0d28b58c3965ad110f41255c92d1b6d5
---
 BoardConfig-common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a3ca747..5cf00b2 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -245,6 +245,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
 $(call soong_config_set,aoc_audio_func,hal_socket_control,true)
 $(call soong_config_set,aoc_audio_func,record_tuning_keys,true)
+$(call soong_config_set,aoc_audio_func,aidl_command_interface,true)
 endif
 
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))