From 0873a888581f82453c8f84d5f4665cc92b3c21f1 Mon Sep 17 00:00:00 2001
From: Mike McTernan <mikemcternan@google.com>
Date: Mon, 3 Jul 2023 11:20:27 +0100
Subject: [PATCH 01/26] tangorpro: revert "set metadata_init_delete_all_keys to
 false"

Reverts ag/18876019 now that the underlying problem is fixed.
Additionally setting this property can cause devices to fill up with
keys and Cts tests to start failing.

Bug: 262212842
Test: boot & factory reset on device
Change-Id: Ieb5e0f68557c3f888a46275387c71e4f15181dfa
---
 device-tangorpro.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 0c526e7..b352574 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -148,9 +148,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.wifi.sap.interface=wlan1
 
-# Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot
-PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false
-
 # Assistant minimum volume
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.assistant_vol_min=1

From e94e0e840ada9f16a3eea927174670dc2bee451b Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Wed, 16 Aug 2023 18:27:24 +0000
Subject: [PATCH 02/26] Add Strong mode configs for dwbc

- Add configs for strong mode.

Bug: 265233091
Test: adb shell dumpsys color_display | grep mTemperatureMin -A10 && adb shell dumpsys display | grep mLowLightAmbientBrightnessToBiasSpline -A2
Change-Id: I9e36f690ba9c79252475dc10e6c5f4fb70932b1c
---
 .../base/core/res/res/values/config.xml       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 15b02f6..678a216 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -249,6 +249,21 @@
         <item>10.0</item>
     </array>
 
+    <!-- See DisplayWhiteBalanceController.
+         A float array containing a list of ambient brightnesses, in Lux. This array,
+         together with config_displayWhiteBalanceLowLightAmbientBiasesStrong, is used to generate a
+         lookup table used in DisplayWhiteBalanceController. This lookup table is used to map
+         ambient brightness readings to a bias, where the bias is used to linearly interpolate
+         between ambient color temperature and
+         config_displayWhiteBalanceLowLightAmbientColorTemperatureStrong.
+         This table is optional. If used, this array must,
+         1) Contain at least two entries
+         2) Be the same length as config_displayWhiteBalanceLowLightAmbientBiasesStrong. -->
+    <array name ="config_displayWhiteBalanceLowLightAmbientBrightnessesStrong">
+        <item>3.0</item>
+        <item>10.0</item>
+    </array>
+
     <!-- See DisplayWhiteBalanceController.
          An array containing a list of biases. See
          config_displayWhiteBalanceLowLightAmbientBrightnesses for additional details.
@@ -258,6 +273,16 @@
         <item>1.0</item>
     </array>
 
+    <!-- See DisplayWhiteBalanceController.
+         An array containing a list of biases. See
+         config_displayWhiteBalanceLowLightAmbientBrightnessesStrong for additional details.
+         This array must be in the range of [0.0, 1.0]. -->
+    <array name ="config_displayWhiteBalanceLowLightAmbientBiasesStrong">
+        <item>0.0</item>
+        <item>1.0</item>
+    </array>
+
+
     <!-- See DisplayWhiteBalanceController.
          The ambient color temperature (in cct) to which we interpolates towards to when the
          ambient brightness is within the low light range, see
@@ -279,6 +304,21 @@
         <item>150000.0</item>
     </array>
 
+    <!-- See DisplayWhiteBalanceController.
+         A float array containing a list of ambient brightnesses, in Lux. This array,
+         together with config_displayWhiteBalanceHighLightAmbientBiasesStrong, is used to generate a
+         lookup table used in DisplayWhiteBalanceController. This lookup table is used to map
+         ambient brightness readings to a bias, where the bias is used to linearly interpolate
+         between ambient color temperature and
+         config_displayWhiteBalanceHighLightAmbientColorTemperatureStrong.
+         This table is optional. If used, this array must,
+         1) Contain at least two entries
+         2) Be the same length as config_displayWhiteBalanceHighLightAmbientBiasesStrong. -->
+    <array name ="config_displayWhiteBalanceHighLightAmbientBrightnessesStrong">
+        <item>130000.0</item>
+        <item>150000.0</item>
+    </array>
+
     <!-- See DisplayWhiteBalanceController.
          An array containing a list of biases. See
          config_displayWhiteBalanceHighLightAmbientBrightnesses for additional details.
@@ -288,6 +328,15 @@
         <item>1.0</item>
     </array>
 
+    <!-- See DisplayWhiteBalanceController.
+         An array containing a list of biases. See
+         config_displayWhiteBalanceHighLightAmbientBrightnessesStrong for additional details.
+         This array must be in the range of [0.0, 1.0]. -->
+    <array name ="config_displayWhiteBalanceHighLightAmbientBiasesStrong">
+        <item>0.0</item>
+        <item>1.0</item>
+    </array>
+
     <!-- See DisplayWhiteBalanceController.
          The ambient color temperature (in cct) to which we interpolates towards to when the
          ambient brightness is within the high light range, see

From 172904aa41bcc97855fb94e836eb0f7451f9554a Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Fri, 15 Sep 2023 14:18:26 -0700
Subject: [PATCH 03/26] Add freeform management feature to tangorpro

Bug: 299362754
Test: Tangorpro doesn't need developer options to enable freeform
support.

Change-Id: Ia2801727817d6800d5493a72bae79c2e6a051ce8
---
 device-tangorpro.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 57dd148..0b734b9 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -219,7 +219,9 @@ PRODUCT_COPY_FILES += \
 
 # Device features
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
+    frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml \
+    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml
+
 
 # Display Config
 PRODUCT_COPY_FILES += \

From 9360f84ce1c3d295d35068b02edc00f2cc1a1713 Mon Sep 17 00:00:00 2001
From: Jimmy Shiu <jimmyshiu@google.com>
Date: Sat, 23 Sep 2023 12:45:45 +0800
Subject: [PATCH 04/26] powerhint: Add DISPLAY_CHANGE hint

Add DISPLAY_CHANGE hint for display layout change due to rotation or
switching between inner and outer panels.

Bug: 298150450
Test: build pass
Change-Id: I9c604752dec907115f5c09cca1de1e965fb8c91a
---
 powerhint.json | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index 95fcd73..eae8758 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -751,6 +751,60 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "ReducePreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "FGPreferIdle",
+      "Duration": 5000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 5000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 5000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 5000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "TAUClampBoost",
+      "Duration": 5000,
+      "Value": "764"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "MemFreq",
+      "Duration": 5000,
+      "Value": "3172000"
+    },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "NPITaskPacking",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "CPU_LOAD_RESET",
       "Node": "GPUMinFreq",

From 54c599b60614b43520ab28a327400b35c77f6e68 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Tue, 26 Sep 2023 14:50:41 +0000
Subject: [PATCH 05/26] Update Low Light Biases

- Interactive = 5250K
- Idle = 4000K

Bug: 265233091
Test: adb shell dumpsys color_display | grep mTemperatureMin -A10 && adb shell dumpsys display | grep mLowLightAmbientBrightnessToBiasSpline -A2
Change-Id: I25c5d815bccfd1eb8258ed71071214e22d04a012
---
 .../frameworks/base/core/res/res/values/config.xml       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 678a216..f7f9037 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -287,7 +287,14 @@
          The ambient color temperature (in cct) to which we interpolates towards to when the
          ambient brightness is within the low light range, see
          config_displayWhiteBalanceLowLightAmbientBrightnesses. -->
-    <item name="config_displayWhiteBalanceLowLightAmbientColorTemperature" format="float" type="dimen">4000.0</item>
+    <item name="config_displayWhiteBalanceLowLightAmbientColorTemperature" format="float" type="dimen">5250.0</item>
+
+    <!-- See DisplayWhiteBalanceController.
+         The ambient color temperature (in cct) to which we interpolate towards using the
+         the look up table generated by config_displayWhiteBalanceLowLightAmbientBrightnessesStrong
+         and config_displayWhiteBalanceLowLightAmbientBiasesStrong. Used when device is in Idle Screen
+         Brightness mode. -->
+    <item name="config_displayWhiteBalanceLowLightAmbientColorTemperatureStrong" format="float" type="dimen">4000.0</item>
 
     <!-- See DisplayWhiteBalanceController.
          A float array containing a list of ambient brightnesses, in Lux. This array,

From 66226b48704a1f0af7d9355b4541d07704d4724b Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Wed, 27 Sep 2023 08:43:35 +0000
Subject: [PATCH 06/26] add mixer path for BLE

Bug: 302270637
Test: manual

Change-Id: I8a8033f60db34fb0693be4a4b48d06d5f833ecf9
Signed-off-by: Yung Ti Su <andysu@google.com>
---
 .../aidl_config/mixer_paths_aidl.xml          | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
index 2d051b8..d89f751 100644
--- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
@@ -435,6 +435,14 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-headset">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -499,6 +507,14 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-headset">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -559,6 +575,14 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-headset">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -628,6 +652,14 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-headset">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -692,6 +724,14 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-headset">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -768,6 +808,14 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-headset">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -882,6 +930,14 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-headset">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -920,6 +976,14 @@
     <path name="usb-microphones -> primary-capture-0" />
   </path>
 
+  <path name="bluetooth-sco-headset-microphones -> primary-capture-0">
+    <ctl name="EP1 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> primary-capture-0">
+    <ctl name="EP1 TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -944,6 +1008,10 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="bluetooth-low-energy-headset-microphones -> voip-capture-0">
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -968,6 +1036,10 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="bluetooth-low-energy-headset-microphones -> fast-capture-0">
+    <ctl name="EP3 TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> sound-trigger-capture-0">
   </path>
 
@@ -1002,6 +1074,14 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-headset">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-speaker">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
@@ -1046,6 +1126,10 @@
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="bluetooth-low-energy-headset-microphones -> voice-call-uplink-0">
+    <ctl name="EP4 TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="null-source -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
   </path>
@@ -1110,6 +1194,10 @@
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
   <!-- codec setting -->
   <!-- Rx device -->
   <path name="speaker-earpiece">
@@ -1318,6 +1406,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="bluetooth-low-energy-headset-microphones">
+    <path name="bluetooth-sco-headset-microphones" />
+  </path>
+
   <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />

From 21ee858b3c0fb1ec70c9418262852a0b8af1007b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 28 Sep 2023 00:29:51 +0000
Subject: [PATCH 07/26] OWNERS: master -> main

Change-Id: Ie7a5ea46e808ee7e51b2b4fa8f76816f713f0ccf
---
 OWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OWNERS b/OWNERS
index 79003ba..7eed0c3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
 per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

From 6763ef499885766e3cc8c64c59c98d3825f10b50 Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Fri, 29 Sep 2023 21:53:11 +0000
Subject: [PATCH 08/26] Revert "Add freeform management feature to tangorpro"

This reverts commit 172904aa41bcc97855fb94e836eb0f7451f9554a.

Reason for revert: Remove this configuration to common configurations
for both virtual and real Tangors.

Change-Id: I6256ed65419d6b0e3e70b7ab5adcc7ab6f67a4b5
---
 device-tangorpro.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 0b734b9..57dd148 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -219,9 +219,7 @@ PRODUCT_COPY_FILES += \
 
 # Device features
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml \
-    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml
-
+    frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
 
 # Display Config
 PRODUCT_COPY_FILES += \

From 7f9b49f89de32ad176d5efa6070f687d4f242855 Mon Sep 17 00:00:00 2001
From: normanwhl <normanwhl@google.com>
Date: Sun, 1 Oct 2023 16:55:25 +0000
Subject: [PATCH 09/26] Disable firmware roaming in idle mode

Add a configurable overlay to control a whether to disable firmware
roaming when the device goes into idle mode.

When the feature is enabled, all STA ifaces will disable firmware
roaming upon entering idle mode. Upon exiting idle mode, all STAs except
ones being used for the local-only use-case will re-enable firmware
roaming.

Bug: 291349183
Test: atest com.android.server.wifi
Change-Id: Id77fdb65844c8f57d25dbb24576f27ff7d2157df
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 497a962..98a4f2f 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -134,4 +134,10 @@
          regulatory approval (for example, FCC pre-approval is required according to "594280 D01
          Software Configuration Control v02r01").-->
     <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
+
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
 </resources>

From 7d8b7fe3c934d2dd0b044ec11c3aaecbbc027802 Mon Sep 17 00:00:00 2001
From: sergiuferentz <sergiuferentz@google.com>
Date: Mon, 25 Sep 2023 15:04:30 +0000
Subject: [PATCH 10/26] Bump android.hardware.graphics.common V4->V5

Test: Build
Bug: 291142745
Change-Id: Ib5ca50de4eac7420a721d59e17070332854f649f
---
 lights/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lights/Android.bp b/lights/Android.bp
index 9544e19..fb2d8ff 100644
--- a/lights/Android.bp
+++ b/lights/Android.bp
@@ -22,7 +22,7 @@ cc_binary {
     static_libs: [
         "//hardware/google/interfaces:com.google.hardware.pixel.display-V7-ndk",
         "android.hardware.common-V2-ndk",
-        "android.hardware.graphics.common-V4-ndk",
+        "android.hardware.graphics.common-V5-ndk",
     ],
 
     srcs: ["Lights.cpp", "led_lut_calibrator.cpp"],

From 5730faa268faab5cffd0acebd42af9827d4819bf Mon Sep 17 00:00:00 2001
From: Sally Qi <sallyqi@google.com>
Date: Mon, 9 Oct 2023 17:39:52 +0000
Subject: [PATCH 11/26] Use android.hardware.graphics.common wrap.

Bug: 291745893
Change-Id: Ie038262255ab5621c7b8ce3cec2b8343ef68f6dd
Test: builds
---
 lights/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lights/Android.bp b/lights/Android.bp
index fb2d8ff..c6fbd12 100644
--- a/lights/Android.bp
+++ b/lights/Android.bp
@@ -9,6 +9,7 @@ package {
 
 cc_binary {
     name: "android.hardware.lights-service.tangorpro",
+    defaults: ["android.hardware.graphics.common-ndk_static"],
     relative_install_path: "hw",
     init_rc: ["android.hardware.lights-service.tangorpro.rc"],
     vintf_fragments: ["android.hardware.lights-service.tangorpro.xml"],
@@ -22,7 +23,6 @@ cc_binary {
     static_libs: [
         "//hardware/google/interfaces:com.google.hardware.pixel.display-V7-ndk",
         "android.hardware.common-V2-ndk",
-        "android.hardware.graphics.common-V5-ndk",
     ],
 
     srcs: ["Lights.cpp", "led_lut_calibrator.cpp"],

From d887dc78301e066d54b03a6440322fd2abeb9132 Mon Sep 17 00:00:00 2001
From: guibing <guibing@google.com>
Date: Wed, 2 Aug 2023 18:20:26 +0000
Subject: [PATCH 12/26] powerhint: tangorpro: update vendor_sched procfs paths

Vendor sched procfs path hierarchy gets updated in kernel.
Update the paths in powerhint json file to match the change.

Bug: 289151587
Test: UIbench ab test.
Change-Id: I85dc5530c25c505fe97738e30c892c4965f3a6ac
---
 powerhint.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 3b47f68..da50d2b 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -156,7 +156,7 @@
     },
     {
       "Name": "CAMUClampBoost",
-      "Path": "/proc/vendor_sched/cam_uclamp_min",
+      "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
         "764",
         "0"
@@ -165,7 +165,7 @@
     },
     {
       "Name": "TAUClampBoost",
-      "Path": "/proc/vendor_sched/ta_uclamp_min",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "764",
         "1"
@@ -174,7 +174,7 @@
     },
     {
       "Name": "FGUClampBoost",
-      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
       "Values": [
         "159",
         "0"
@@ -183,7 +183,7 @@
     },
     {
       "Name": "MLUclampBoost",
-      "Path": "/proc/vendor_sched/nnapi_uclamp_min",
+      "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min",
       "Values": [
           "225",
           "813"
@@ -202,7 +202,7 @@
     },
     {
       "Name": "CDPreferIdle",
-      "Path": "/proc/vendor_sched/cam_prefer_idle",
+      "Path": "/proc/vendor_sched/groups/cam/prefer_idle",
       "Values": [
         "0",
         "1"
@@ -248,7 +248,7 @@
     },
     {
       "Name": "TAPreferHighCap",
-      "Path": "/proc/vendor_sched/ta_prefer_high_cap",
+      "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap",
       "Values": [
         "1",
         "0"
@@ -257,7 +257,7 @@
     },
     {
       "Name": "TAPreferIdle",
-      "Path": "/proc/vendor_sched/ta_prefer_idle",
+      "Path": "/proc/vendor_sched/groups/ta/prefer_idle",
       "Values": [
         "0",
         "1"
@@ -266,7 +266,7 @@
     },
     {
       "Name": "FGPreferIdle",
-      "Path": "/proc/vendor_sched/fg_prefer_idle",
+      "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
       "Values": [
         "1",
         "0"
@@ -276,7 +276,7 @@
     },
     {
       "Name": "CDPreferHighCap",
-      "Path": "/proc/vendor_sched/cam_prefer_high_cap",
+      "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap",
       "Values": [
         "1",
         "0"
@@ -605,7 +605,7 @@
     },
     {
       "Name": "Dex2oatGroup",
-      "Path": "/proc/vendor_sched/dex2oat_ug",
+      "Path": "/proc/vendor_sched/groups/dex2oat/ug",
       "Values": [
         "1",
         "0"

From 13f0733d7c9593d1629a1f2bf8601d062ac617fd Mon Sep 17 00:00:00 2001
From: Alice Kuo <aliceypkuo@google.com>
Date: Wed, 11 Oct 2023 15:41:39 +0800
Subject: [PATCH 13/26] Use classic connection by default with LE audio device
 for T6pro

Bug: 300012501
Test: manual
Change-Id: I32502d1e9ca4ea14bc70ba469e3ffb2d1e106c7c
---
 bluetooth/syna_default.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index 53a04b1..a389ffd 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -46,6 +46,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.leaudio.toggle_visible=false
 
+# LE Audio use classic connection by default
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.bluetooth.leaudio.le_audio_connection_by_default=false
+
 # Bluetooth HAL and Pixel extension
 DEVICE_MANIFEST_FILE += \
        device/google/tangorpro/bluetooth/manifest_bluetooth.xml

From 45e117b89052482423345f4b64bd37a4d3e5ce06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Thu, 12 Oct 2023 06:41:55 +0000
Subject: [PATCH 14/26] Extend the APMg3 tunings to also handling turning AEC
 off

This CL extends APMg3 tunings for the tablet, dock and headset usecases with counterparts where the AEC is off.

Bug: 301568974
Test: Running CTS test suite verification. Manual testing in calls on Tangor.
Change-Id: I87fd24ba084691c238f5c07272208049acaf2e5d
---
 audio/tangorpro/audio-tables.mk                  |   3 +++
 .../tuning/apmg3/uplink_dock_aec_off_config.pb   | Bin 0 -> 2078 bytes
 .../apmg3/uplink_headset_aec_off_config.pb       | Bin 0 -> 2069 bytes
 .../apmg3/uplink_tablet_stereo_aec_off_config.pb | Bin 0 -> 2833 bytes
 4 files changed, 3 insertions(+)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb

diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index da4490b..b7e383a 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -65,6 +65,9 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_aec_off_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_headset_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_dock_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_tablet_stereo_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..bd8b7201345389eaefd40eb5f0ba4c1c1e7155a1
GIT binary patch
literal 2078
zcmds&O=uHQ5XWcI#J+B`G~H%xns)0W5=@JMkPy1mCi^!1u+|o8@lc9FEm))=Lj5W|
z1w=0jinkO&LA;3<54|XsqEMs-1yS^*2QQv_5uq2I*(9_TR20GDVQ1gR|Gk}=o!@)f
zJ=8Q&{Nf8?1SJ|i0nu6kCP2}NH3{T~vTi*ss#rik=qq;m1f~TwAp#P+EdfT0zz{?m
zbzVby<wh{xy!g_VFc$WNHL@;&1;Mh&fW(PTS`;8TK(tjr7GO!`0M^}p8gY-)4(cSp
z;Bt(dnWATw9^-bcRx36zBqBbePxwOqNI=R2rXZKeWSo9BBWtU}`7yr;gu>%6iKk$;
zo<5Hjs5biQ{FV+B5u<Zjt7tdR7?--Owbj*J{BhTnY?3@s+0lm2hm4@mP2Sbw9{CwI
zY5SbTL-B=DDZeR=1x3)Do}MmC6B|eoO)7f>6%67iPQqypb<@N?`t(Y!D7O^76Xz}k
zgElH00hsUGVP>U34*gRjUGm`Prs$BQVn%TsJDYVc%?}Qqcw&8+Kk7)}g0UeT<B49b
zZHMwN-8dIOl1-M44GOx$q**DDW_K@X?zr@i01AGtsG&BIriqn9mBpW44<xxH%KvXH
zpkHWww><F*h2Pk(HRzAdHT9U<o4q|$XTy1;LFbw?-zRTy;SJ}lh0<HD0C1wL=0Yla
zR#9&sDA&tEsfDBQrG#Clw4qkL<Jk2ayHucgrDS_TaG(kY!($PFhM(BOsAs)eOLFMr
zFvUT7(0YlO@AD>SnA#qKnCB8bshS)&&fkBwuWJsb2qXFsF#a&3k<x1=AiA)PQ1A%l
zgiri2p%;lz-E3YwVsoN$an2igPK4g<C><t3>xs~_j>SD9G)PIldw>!E&UaEGbc?i1
zs8n{#{{!fbJ28Ic&{ja1%}qdY8=zd!&`YH#UHbLX&9eCmfG#ahyr=@o?9%DJ$|#l?
zP>&`)3A_RFfR5-)=3(9gbkF6h4yms>RW%DuURhOxVs!En6Oann0VRgKlPFKzNSAh7
zcV#*eq|*X^1I`srLecTy3{~N@QgyjaIPr&Y#?pLl(G9P4?(%N?nsnveU4CPs@}?UL
L#*waFw4dWQ8rY?a

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..03f757496217664b6e857e43cb326c3c81e1f346
GIT binary patch
literal 2069
zcmeHIL1+^}6#YNVn&~#7>6(~y+r?!exD5tELUD;CJDaqnRtq(FC_%9V3{nuGqC!p!
z;z>d9WIPqbn>P==hJq3>5xnTxgBMS|iM{Cmn-)S(f(I@1Fn|8ce}CrxKl5hP*Qlz(
z{}GB~8cozf0`!Q0B!KT)rv;L-Esgg-Z%RuM5dVeQkidc<71Cg0$q=ATi%=Z&sTlhZ
zUV3TFq;@_zCe#xFaLgRHu_^?T(~^meEIBCz2he8(%mZ{~8DP&_q#5r9tsrj!Ebm$r
zOq1FcHSI-2jfj1Wi*!g^5K26pR!p!l-zXQ0MR$?K>Y#t6QV)|cu?`z}8@48Bdo)1K
z(yr~10r-geLv=>PlBu1mjzNy)%w6qKDMt~=`R8+;%UYC-ysE(?iZhy2zr4C=5WqbG
zwW4HfwOT`{y^oZUDV=Ev%eaOcaEE+Gg!L_SSSnxAdR;fem7`qHL5ZsX?S&KZcQsgp
zb<C!QW&YZ}<{B(av>^`;6f8E>=&JfvKF=D}-}G`U_~bkXB$N__=~W4Hrbd`;k1zn$
zFyH5uSy3QE?-ChIFEjZ5c`5g@)2R&4udc)%Om%k~A5nz0^Xg=bP02yOUolwICS!Bg
zpOtx{987Qol5apoXY|>}Ph2uSbq~=DOtR+@bdZhWC{nBhiB>2i)1%e)JhNa&DHy1y
z1!`fU9qNG$?iuCjyX(;81OvYME;;qM2)?_?gpCt_d0-p)@iHs--@H3_p-KFqEr59s
zn<^KAH5>GQK+OrF=Dk0o<_PqJn*YJWa=fTXk8`p3_PA2hDiBTiV^_1Mf=_;|aL|{A
SJys8T`l;y2q~8{u5BM9ZU6)({

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..eb615ce7b45a462e651fef26a260e9973943e5c5
GIT binary patch
literal 2833
zcmeH|YfMx}6vt;^SFV>GSyzrAx_Y~Yx}r2>cki-AcJH|$6sQkGObBX&S_z>VUr`B-
z$y%#5zOc47LLZuHA3m@jY9myQhE#(FjU-m$qiMAvT4Ss=)>mTfnG05IYFgV5O_P4O
z=iZt5pP6&c%<qo+5m!|udOOC+lexxSF$znGQy4H7H9Y+k4i{?o815-``KHINFy{lF
z7Nc;VLZ2*|X*|oVFxLRZ=42^-h4djuG?RI1(%$xv#!3<`VXW5M%X1WklT*IN%hSlo
zPIAUl1}aQv>=1?-yKd%Dk2#fQz?qB{w0J0(>GaH}$F(_5jZ^M%r;;4w8cnm>lI@!2
z<r&_v-|si_q#1j>ZA_%Zrr4c{Wvqf%vH9^N<Zgz8Xw}*t4Ho4*rA8g742Gn=6GCos
z45uE*T%o5^1gIA${9NdAC<5fHZrP$Z6G815n(Zcmk$SwXE&NF8aVQR`tgP&kdhc<{
zD2kzb99aP`<`rx<IrT7}&KOGGs#O$e!b3)?Y*I3@A&z`3W34&=WuuuC{l8$M2Cds|
zig_7NOA=O@cfT<0p!-5?si85dF$*!DM-Jp#hn(uKnOz$ycU6}r#E@krlBP9>H2rf)
zv&E!6Vl2ldPgKz$#YY3Jh273qPUojL)YnHcxZJ-IyI9osY)knmuGm~7)dX>MLQ@#z
zyl%B)Yql#v$b$rB&j+%t4tGQS8F>Pjks{Ue!mA?CP(Q$Ug4#MSa-6b>&9H~!(NQ!|
zP)9_DltUqXhgz|>mrN9U6*x<h74EVTdpyOm)>%uJg(+jxWs+S7(ICg#(bizKq&7Y|
z#;S^Ua7JQSiWcrVJS?+@PbZ9MAtv!>)ha2iFE2~k^aq5>g8zL&7ZahP2cdIZ%d#kP
zB6P#>`WK1Ncp`Lx;g&5T)Io%99YuK%p^r<6&>qq*LNyExcxphc4IV2i^}qRNH7I6}
z0F`WZ0m{9MAnFOIJkTtc&ZTD3)@!CN&7T0u{sN$fTFOs61XQvs0gVuf^$`Me_>{VC
zVr2(KK)-0e|MQ3i=#b^B4N|W$9;zkUL@Wur)eI#^5lv=e57|*Evi?L8P|c*-uA7?A
z>yU{)1)Qz22vNg=(@8h1Y<S%ny~Dr3`9w55KKa+8`&~`zW!?3$zV3Hc*PG{bzv;fB
zeW6R2r`@otv(y11vdR_`t4phb;)9w4x|nKq>SEY};!HJBY&>|{FJ?GPgJKq2t&8ot
zmZ=UFv|X%+vBsC2y%Z3IiKBw#C4VEL|A*%TU9Mj**sa6le(#J^_s6JSvFWfQTbQ1E
zA#rI(Ql_|>zFrr1a7$1;xP34vuwuS0>gsM~szb%JmU-DCJ$+qJ#A&%f;i$Q+i>7{8
zbdm0RPZzmqOM*1rwKWg2MAoPiAu-n*pb(pu286ul#oFt~{i3t{P(aK%dP=A1tgx-v
zI_I_r#M}N<T}&LbT^BdRnt-U<*{suak8-n=9cnlr%)B!Jaqy+ifT&-%Cm_z>*`}+$
z9!ksSoAh^sU43`M_jNIJ#{2s3B#%`t9Cu9@J2p=W2wM%U{+chO(^foM-THc?`F_Ca
zgSAsPj)&?aU*_~MeaAa<VE)KV6FTC`5l%1jAZ)0NAdG;Q5%NMGBb=>XfslQ14#KhM
zQUu$!a|r8xx`=RV%zcCd7;D0`#xn>DFYQFA+}DioRr_ZMe8Lw9?);4ijpt4y{4(hT
zLZY(`p(tjh30Ep-n$YLfYY3%B+7aSw_aUe^KSdZfuMVN&ZVkeI=VXMaJ`kaBqyxd;
zGz4L>FNAP)MK;1)-zx~O2YMq+j5-m%Eh#{7e)0;!%7pa@b35z^#YayX(0;2w!t91J
zgxe#k5KdmWjPUFbhY5P~FcUV<d(MP}29F8PY@cp|(m39PJ^mjNS}S)TT-@*`!Vk&2
V5F(2j5$cwg8qjCVF(Y)8{|XTSht~iA

literal 0
HcmV?d00001


From 0d282e54c365e7d5df883cf5513c38b34e666424 Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Wed, 18 Oct 2023 09:08:26 +0000
Subject: [PATCH 15/26] update idle brightness curve

Bug: 304655186
Test: check dumpsys display
Change-Id: I5b95328c993b15c9f68d15fb6f8c0439e41e7e5d
---
 .../base/core/res/res/values/config.xml       | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index f7f9037..b914fdc 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -462,17 +462,24 @@
 
          Must be overridden in platform specific overlays -->
     <integer-array name="config_autoBrightnessLevelsIdle">
+        <item>1</item>
+        <item>2</item>
         <item>3</item>
-        <item>6</item>
-        <item>11</item>
-        <item>31</item>
-        <item>64</item>
-        <item>113</item>
-        <item>180</item>
-        <item>264</item>
-        <item>364</item>
-        <item>451</item>
-        <item>885</item>
+        <item>4</item>
+        <item>8</item>
+        <item>12</item>
+        <item>20</item>
+        <item>33</item>
+        <item>55</item>
+        <item>90</item>
+        <item>148</item>
+        <item>245</item>
+        <item>403</item>
+        <item>665</item>
+        <item>1097</item>
+        <item>1808</item>
+        <item>2981</item>
+        <item>4915</item>
     </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
@@ -515,18 +522,25 @@
          This array also corresponds to the lux values given in config_autoBrightnessLevelsIdle.
          In order to activate this mode, config_enableIdleScreenBrightnessMode must be true. -->
     <array name="config_autoBrightnessDisplayValuesNitsIdle">
-      <item>0.400000001</item>    <!--  0 - 3 -->
-      <item>2.424401926</item>    <!--  3 - 6 -->
-      <item>4.016322573</item>    <!--  6 - 11 -->
-      <item>6.924331831</item>    <!--  11 - 31 -->
-      <item>18.21836204</item>    <!--  31 - 64 -->
-      <item>36.9199795</item>     <!--  64 - 113 -->
-      <item>65.40219962</item>    <!--  113 - 180 -->
-      <item>104.0902078</item>    <!--  180 - 264 -->
-      <item>152.5833029</item>    <!--  264 - 364 -->
-      <item>210.1432982</item>    <!--  364 - 451 -->
-      <item>260.2204941</item>    <!--  451 - 885 -->
-      <item>500.2693058</item>    <!--  885 + -->
+      <item>5.139055</item>       <!--  0 - 1 -->
+      <item>9.962018965</item>    <!--  1 - 2 -->
+      <item>18.34822964</item>    <!--  2 - 3 -->
+      <item>21.55068128</item>    <!--  3 - 4 -->
+      <item>24.0167788</item>     <!--  4 - 8 -->
+      <item>30.62162162</item>    <!--  8 - 12 -->
+      <item>35.09486396</item>    <!--  12 - 20 -->
+      <item>45.38057825</item>    <!--  20 - 33 -->
+      <item>62.187656</item>      <!--  33 - 55 -->
+      <item>88.01503</item>       <!--  55 - 90 -->
+      <item>118.924484</item>     <!--  90 - 148 -->
+      <item>147.89162</item>      <!--  148 - 245 -->
+      <item>175.12471</item>      <!--  245 - 403 -->
+      <item>191.33968</item>      <!--  403 - 665 -->
+      <item>226.19489</item>      <!--  665 - 1097 -->
+      <item>295.24768</item>      <!--  1097 - 1808 -->
+      <item>396.007</item>        <!--  1808 - 2981 -->
+      <item>440.62778</item>      <!--  2981 - 4915 -->
+      <item>600.0</item>          <!--  4915+ -->
     </array>
 
     <!-- Enables idle screen brightness mode on this device.

From 0b7ef55592967724acbe6e71023185f72b1997ee Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Fri, 20 Oct 2023 11:54:43 -0700
Subject: [PATCH 16/26] thermal: align the setting VSKIN related sensors

Bug: 302435949
Test: emul_temp
Change-Id: Ie9ae057b28836ebbc79eb0770749d962624b24cd
---
 thermal_info_config_tangorpro.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 72e380a..1aa4981 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -140,8 +140,8 @@
             "VirtualSensor":true,
             "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
-            "Coefficient":["1.0", "1.0", "1.0", "1.0"],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -156,8 +156,8 @@
             "VirtualSensor":true,
             "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
-            "Coefficient":["1.0", "1.0", "1.0", "1.0"],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,

From de157ab813ff19cf478a0117cfe11b808e19af21 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Mon, 23 Oct 2023 14:37:10 +0800
Subject: [PATCH 17/26] Split bootloader prebuilt to 24Q1 and trunk version

Bug: 299879102
Change-Id: I17599698ca55d738e935b914bbfe55641650f9e1
---
 device-tangorpro.mk      | 5 +++++
 tangorpro/BoardConfig.mk | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index ae62f59..b6aa43c 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -162,6 +162,11 @@ include device/google/tangorpro/fingerprint_config.mk
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk
+endif
 
 # Wifi SAP Interface Name
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index a38dff3..7998f22 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -15,6 +15,11 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
 
 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true

From 6b596fa40f25f419bd1566e801850d31157b4661 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 25 Oct 2023 16:22:49 -0600
Subject: [PATCH 18/26] Fix lunch choices for git_main

We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: Ieb15ee967e144853e06c66af791187f00c9b3dc1
---
 AndroidProducts.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 622dab6..541e43a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -20,4 +20,4 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_tangorpro.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_tangorpro-userdebug
+    aosp_tangorpro-trunk_staging-userdebug

From 081174c294b5a61abe72e5c154949831a245c469 Mon Sep 17 00:00:00 2001
From: Will Song <jinpengsong@google.com>
Date: Fri, 27 Oct 2023 22:09:31 +0000
Subject: [PATCH 19/26] PREUPLOAD: Enforce jsonlint in preupload

Checks syntax and simple brace balances for all JSON files.

Test: Edit any json file and try upload
Bug: 127794899
Change-Id: I25768e912deffa81d5bb3248d17d7de7a0e754f2
---
 PREUPLOAD.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..37ebb5e
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Builtin Hooks]
+jsonlint = true

From 83fd45576476e60e7afe48f1541e6c9a54cd2ea7 Mon Sep 17 00:00:00 2001
From: Behnam Heydarshahi <bhnm@google.com>
Date: Tue, 31 Oct 2023 20:59:58 +0000
Subject: [PATCH 20/26] Bugfix: Ring volume stuck at zero on tangor

Solution: offer a boolean config for volumeUpToExitSilent and
overwrite it for tangor.

Flag: NONE
Bug: 279645379
Test: Manual. Slide ring volume all the way left in settings.
Press volume up. Ring volume slider progress should move away from 0,
and the ring icon should change from silent to normal.

Change-Id: I6ade8d8009ec3f2775de60835c75a014e466ee4b
---
 .../overlay/frameworks/base/core/res/res/values/config.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index f7f9037..d65534a 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -655,7 +655,10 @@
     <integer name="config_audio_notif_vol_default">0</integer>
 
     <!-- Volume policy -->
+    <!-- Strongly consider keeping these 2 values in sync - otherwise vol up/vol down have confusing
+    asymmetric behavior, as in b/279645379 -->
     <bool name="config_volume_down_to_enter_silent">true</bool>
+    <bool name="config_volume_up_to_exit_silent">true</bool>
 
     <!-- This device does not allow mobile data. -->
     <bool name="config_mobile_data_capable">false</bool>

From 30acd7ccadbb029867061ece3fbf400f7b9e74d3 Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Mon, 20 Nov 2023 13:06:25 +0000
Subject: [PATCH 21/26] update idle brightness curve

Changed the brightness from 5 nits to 2 nits at 0 lux.

Bug: 304655186
Test: check dumpsys display
Change-Id: Ie3aa91f5867e2ec5181b69f10ec27eff67c424e6
---
 .../overlay/frameworks/base/core/res/res/values/config.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index b54cbb5..03950c0 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -522,7 +522,7 @@
          This array also corresponds to the lux values given in config_autoBrightnessLevelsIdle.
          In order to activate this mode, config_enableIdleScreenBrightnessMode must be true. -->
     <array name="config_autoBrightnessDisplayValuesNitsIdle">
-      <item>5.139055</item>       <!--  0 - 1 -->
+      <item>2.0</item>       <!--  0 - 1 -->
       <item>9.962018965</item>    <!--  1 - 2 -->
       <item>18.34822964</item>    <!--  2 - 3 -->
       <item>21.55068128</item>    <!--  3 - 4 -->

From 6423f901ed953ab009ed3bc69faff2496d3a249c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Tue, 28 Nov 2023 23:13:43 +0000
Subject: [PATCH 22/26] Update APMg3 and tuning configs to version 11

This CL updates the APMg3 tunings to version 11.
The changes performed is to remove any signal level gains applied in APMg3 in AOC
for the headset usecase when the AEC is off. This eliminates the issue of 25 dB
gain being applied when headsets are used causing some headset audio signals to be
saturated.

This is a correction of the CL
https://googleplex-android-review.git.corp.google.com/c/device/google/tangorpro/+/25019613
which both included an active gain for headsets when the AEC is off.

As a safety precaution, and to allow easier spotting of such issues, the CL also
explicitly sets the gains to 0 dB also for the other headset tuning (before it was
just deactivating the gain application for that)

Bug: 309517292
Test: Manual test calls on Tangor using Meet.
Change-Id: I4f29cd780fa6ca52df543387546d2a4b4b161139
---
 .../apmg3/uplink_headset_aec_off_config.pb    | Bin 2069 -> 2069 bytes
 .../tuning/apmg3/uplink_headset_config.pb     | Bin 2069 -> 2069 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
index 03f757496217664b6e857e43cb326c3c81e1f346..5daa2d1c1a4a35246310d1848a2663c33cf29141 100644
GIT binary patch
delta 22
bcmbO#FjZiJJU4?V14DzoEQr{s^_m?3J7NWb

delta 22
ecmbO#FjZiJJU62#1H%Fb*<(NB9X4vcW(NRC83#iE

diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb
index b2c4aa61a3d8323778026dd9dcd1dd9cbfe67c09..936bb398c11f764f1415cf70d5d1107ef74ff6cf 100644
GIT binary patch
delta 18
ZcmbO#FjZiJGJAu)ECWM>{YI_V>;N(>1#JKT

delta 18
acmbO#FjZiJGW!At*<(NB9X4vcW(NR2)CVm9


From cabd89d9138b97a6cc1ab9d6d00758df300f4ab7 Mon Sep 17 00:00:00 2001
From: Yvonne Yip <ykyyip@google.com>
Date: Mon, 11 Sep 2023 20:55:32 -0700
Subject: [PATCH 23/26] powerhint: add game mode tuning nodes

Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes.

Test: build
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cdf834206df344a704f7f6f21e503f0e3abd4bbb)
Merged-In: Iae9629e0f69d437f7444022d81a478d0c12f2bbe
Change-Id: Iae9629e0f69d437f7444022d81a478d0c12f2bbe

Change-Id: I0491f1e956686025cd4903b4356f36c0682baf6f
---
 powerhint.json | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/powerhint.json b/powerhint.json
index da50d2b..57fb6eb 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -59,6 +59,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "CPULittleClusterDownRateLimitUs",
+      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
+      "Values": [
+        "5000",
+        "500"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUMidClusterMaxFreq",
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@@ -87,6 +97,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUMidClusterDownRateLimitUs",
+      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
+      "Values": [
+        "20000",
+        "3000"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUBigClusterMaxFreq",
       "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq",
@@ -115,6 +135,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUBigClusterDownRateLimitUs",
+      "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
+      "Values": [
+        "20000",
+        "3000"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -144,6 +174,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUTaperedDVFSHeadroomEnable",
+      "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -298,7 +338,7 @@
       "Values": [
         "0",
         "1"
-      ],
+      ]
     },
     {
       "Name": "DisplayWakeup",

From deb5fb62d84c30ce56a2a736825b896c97da915d Mon Sep 17 00:00:00 2001
From: Yvonne Yip <ykyyip@google.com>
Date: Mon, 11 Sep 2023 20:56:18 -0700
Subject: [PATCH 24/26] powerhint: game mode tuning

Test: test build
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:00d94318d492669c6c132d702ee73ccd515fa5bf)
Merged-In: Ie1c7672d9950630ee868538e49937580d3aece4d
Change-Id: Ie1c7672d9950630ee868538e49937580d3aece4d
---
 powerhint.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index 57fb6eb..45d5de6 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -691,6 +691,36 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 5000,
+      "Value": "1280"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUTaperedDVFSHeadroomEnable",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPULittleClusterDownRateLimitUs",
+      "Duration": 5000,
+      "Value": "5000"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUMidClusterDownRateLimitUs",
+      "Duration": 5000,
+      "Value": "20000"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUBigClusterDownRateLimitUs",
+      "Duration": 5000,
+      "Value": "20000"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -1626,6 +1656,36 @@
       "Duration": 0,
       "Value": "572000"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
+    {
+      "PowerHint": "GAME",
+      "Node": "CPUTaperedDVFSHeadroomEnable",
+      "Duration": 0,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "GAME",
+      "Node": "CPULittleClusterDownRateLimitUs",
+      "Duration": 0,
+      "Value": "500"
+    },
+    {
+      "PowerHint": "GAME",
+      "Node": "CPUMidClusterDownRateLimitUs",
+      "Duration": 0,
+      "Value": "3000"
+    },
+    {
+      "PowerHint": "GAME",
+      "Node": "CPUBigClusterDownRateLimitUs",
+      "Duration": 0,
+      "Value": "3000"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",

From 79cc4d6fe73bd65d5cef3ba7dc70c2929f0922df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Fri, 8 Dec 2023 00:03:57 +0000
Subject: [PATCH 25/26] Update APMg3 and tuning configs for the tablet and dock
 mode to version 12

This CL updates the APMg3 tunings to version 12.
The changes performed is to increase the AEC transparency as well as
increase the robustness to echoes.

The tunings have been verified by audio labs in TPE and STO and documented in
https://docs.google.com/spreadsheets/d/1kL9XqE406CGI_LaggCmI9mJ1DUuelmvFMI4FksYEKJA/edit?pli=1#gid=674561254
https://docs.google.com/document/d/17FBTzIA7fuGnkS_fPvE4MN2sB_FKM2EPelPeBvTamzE/edit?tab=t.0#heading=h.h0idgem10n71

The sha256 checksums for the tuning files are
uplink_tablet_stereo_config.pb: e7c4b95c28f87b4f62bbf320a244df7bd26f2075c3646a3ba962c746d409fa33
uplink_dock_config.pb: 7ac91df3386dd26c8bafec4bb5a52917507b4baf13934aec4262aa2fc2be2123

The tuning files are also available in the google3 folder
third_party/apmg3/rtc_tools/dsp/tunings/tangorpro
(being landed as part of google3 cl/588934009)

Bug: 295551854
Test: Manual test calls on Tangor using Meet. Lab test performed by both STO and TPE labs
Change-Id: Id6bf7439a6c02c866a06f47fad239c0fb3cef632
---
 .../tuning/apmg3/uplink_dock_config.pb        | Bin 2078 -> 2082 bytes
 .../apmg3/uplink_tablet_stereo_config.pb      | Bin 2833 -> 2842 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb
index 7996795fe7ce0c9c8dca52c4ca3b55a5d30dfe4a..2598ca2cad50c48c98f716880edf4623e25c1d5e 100644
GIT binary patch
delta 151
zcmbOyut;FSO2)+-S9vfoGEV-?lp%DDk%L7@hl`&#U#Qti^nvaKtI4^{szI}6MmmTx
zFeEt0o;~AZC&bTdZ2Z|CD8K*_kY!*vV6SRyY;3Q<puudwVZrIZ<t59j8Pjho%HSa5
w29$SjP%zTqFkrA?aA5Qh3E-Ms&#pb0mqnGAmxBRh5Q7AR0)xS3Tb75+0P))*lK=n!

delta 143
zcmZ1^Fi&8@O2+vcS9vfoGEDx=lp%D5k%L7@hl`(gPl>RNDA#pmo5{J%ssU+fY4)NF
z3=Q_OXV3W93Gwry3dk}r9I#iNHB-`FfkA`GfWv~*fy+ypS2L#H7O3ll6Hwm4K|xM~
h!+^np!GY03WbzZ{0B&v$2B0hhg9L-ZW=EEX%mDn(B8LC~

diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb
index 4c8a821bb6edac1518f3bcd12768b0af17eebde9..341b6e71b126eb0268af42c695551aad7ebcdd8c 100644
GIT binary patch
delta 233
zcmbOzHcM>6O2!o%R~a+O%J4EUG}w!-b5Gna`>-m+UV%Y_(SXr{!S(E!Gj@}|GNmzI
zn;gR|S^p+*hpi}3%vP4``eGZ|Su=0it1>V!*h}ef@$(uRZ?+d@U^rk8mK5UWO-oAy
z2{b?ifU0NOtAfOUrZXF`T5vh=dCBsEOcP~rka3e`V0hr55TL<kz+l1Pz~&(kkP;-p
z!6?MS!6?8e1tur=vrA9rW#Lg5kYEDZ+hDIDXCPt=VwA2qs%~Dvn8eG$0JM>TL4rYn
M!GLkI9m{1l0HFFizyJUM

delta 222
zcmbOwHc@QCO2+vcR~a)&i1RWqG}w!-b5Gna`>-m+UV%Y_(SX5%Ve&7gG{!5F6PYFJ
zxvneQh(=hN*vN8SUu+{gYvxURRR#tIdnp|*e%?acE<4d#GbQc8l0y8vXsQ_)4%n-L
z<beh=8?ah%JMef(^8y9zL>U-PILR_FJaAA5&|m}E>A>b85G29DD8$0SD8MKMCRG_G
x|7KQI<(6PlJ$vSit%jU|h%Ly)rE89=n^!O<adR*L4Ps!BU{GM#?9OtT4FDJMHZ%YL


From 1c04ca0cc5989dd2c111eb472e53a19319eaca9f Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Wed, 13 Dec 2023 16:42:04 +0800
Subject: [PATCH 26/26] Branch bootloader prebuilts for 24Q2 release

Bug: 313350495
Change-Id: I4383678c9071149b295be82924de451002803cae
---
 device-tangorpro.mk      | 2 ++
 tangorpro/BoardConfig.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index b6aa43c..54002a6 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -164,6 +164,8 @@ include device/google/tangorpro/fingerprint_config.mk
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk
 endif
diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index 7998f22..65d4c33 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
 endif