From 5b48802a60b905567216e8deb6af415e6e1bdd38 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Sun, 12 Jun 2022 18:19:02 +0000
Subject: [PATCH 1/2] Bluetooth: Refine Bluetooth HAL manifest

Remove duplicated manifests which are included at bluetooth/manifest_bluetooth.xml.

Bug: 203055537
Test: lshal to see Bluetooth HAL services
Change-Id: Ib39f208245c9ef476285898606289d29717ed8ca
---
 manifest.xml | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 63b8a14..5909ae3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -84,24 +84,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothHci</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>
@@ -131,33 +113,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.sar</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothSar</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>

From 20afe0d66dda096abcfdcfaa5451756bb4194cf0 Mon Sep 17 00:00:00 2001
From: Gil <gilliu@google.com>
Date: Tue, 31 May 2022 19:29:27 +0800
Subject: [PATCH 2/2] display: update the indoor auto-brightness curve

Sync the indoor range mapping in
the indoor auto-brightness curve.

Bug: 234416291
Test: Check the default curve value
Change-Id: Ia0e3bdf2bd19533f31f0a97a7c80ec13d7cbd0a7
---
 .../frameworks/base/core/res/res/values/config.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lynx/overlay/frameworks/base/core/res/res/values/config.xml b/lynx/overlay/frameworks/base/core/res/res/values/config.xml
index 58197aa..985f64d 100644
--- a/lynx/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/lynx/overlay/frameworks/base/core/res/res/values/config.xml
@@ -59,6 +59,7 @@
         <item>4</item>
         <item>8</item>
         <item>12</item>
+        <item>15</item>
         <item>20</item>
         <item>33</item>
         <item>55</item>
@@ -96,12 +97,13 @@
       <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>41.2249643</item>     <!--  20 - 33 -->
-      <item>47.6760716</item>     <!--  33 - 55 -->
-      <item>55.73002427</item>    <!--  55 - 90 -->
-      <item>66.24126116</item>    <!--  90 - 148 -->
+      <item>32.5</item>           <!--  8 - 12 -->
+      <item>46</item>             <!--  12 - 15 -->
+      <item>53.26923077</item>    <!--  15 - 20 -->
+      <item>54.61538462</item>    <!--  20 - 33 -->
+      <item>58.11538462</item>    <!--  33 - 55 -->
+      <item>62.1394</item>        <!--  55 - 90 -->
+      <item>67.13133333</item>    <!--  90 - 148 -->
       <item>79.67614115</item>    <!--  148 - 245 -->
       <item>98.04727274</item>    <!--  245 - 403 -->
       <item>125.1221991</item>    <!--  403 - 665 -->