From dbc0ad4d25e01f8d6a170ba2f93d705b709674be Mon Sep 17 00:00:00 2001
From: weichinweng <weichinweng@google.com>
Date: Tue, 25 Jul 2023 06:05:30 +0000
Subject: [PATCH 1/2] Enable Bluetooth CHRE feature on bt_vendor.conf

Bug: 292853832
Test: Enable Bluetooth, make sure it will go the AOC path.
Change-Id: I017971d2eb95fefac152bbb466c38a7830672f02
---
 bluetooth/bt_vendor_overlay.conf            | 3 +++
 bluetooth/bt_vendor_overlay_ripcurrent.conf | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index dc30336..37c1900 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -3,6 +3,9 @@
 # Uart port name
 UartPort = /dev/ttySAC18
 
+# Userial type
+UserialType = 2
+
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true
 
diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf
index 2473a1b..a4a91d5 100644
--- a/bluetooth/bt_vendor_overlay_ripcurrent.conf
+++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf
@@ -3,6 +3,9 @@
 # Uart port name
 UartPort = /dev/ttySAC18
 
+# Userial type
+UserialType = 2
+
 # Sar backOff high resolution support
 SarBackOffHighResolution = true
 

From 82a1fe6edd2ee217a10bec0633d06185fca370c0 Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Fri, 11 Aug 2023 08:19:31 +0000
Subject: [PATCH 2/2] display: remove blocking zone

use display device config file instead of config.xml

Bug: 284787798
test: check the dumpsys display
Change-Id: I68a5f35e712f5aabc014322f33bcb2c1ef6daa6a
---
 .../base/core/res/res/values/config.xml       | 28 -------------------
 1 file changed, 28 deletions(-)

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 975a32f..69218fa 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -142,34 +142,6 @@
     <!-- The default peak refresh rate. -->
     <integer name="config_defaultPeakRefreshRate">120</integer>
 
-    <!-- Not allow to switch to higher refresh rate when display brightness setting is
-         equal or less than this value -->
-    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
-        <!-- System brightness for 10 nits: round((10-2)/(1400-2)*(255-1)+1) = 2 -->
-        <item>2</item>
-        <item>-1</item>
-    </integer-array>
-    <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
-        <item>-1</item>
-        <item>10</item>
-    </integer-array>
-    <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
-    <integer name="config_defaultRefreshRateInZone">120</integer>
-
-    <!-- Switch to fixed refresh rate when display brightness setting is
-         equal or more than this value -->
-    <integer-array name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">
-        <!-- System brightness for 1000 nits: round((0.71*(255-1)+1) = 181 -->
-        <item>181</item> <!--100% UI normal brightness -->
-    </integer-array>
-
-    <integer-array name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">
-        <item>50000</item>
-    </integer-array>
-
-    <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
-    <integer name="config_fixedRefreshRateInHighZone">120</integer>
-
     <integer-array name="config_ambientThresholdLevels">
         <item>2</item>
         <item>3</item>