From 51c1cfe4614c20ee628c9a836c194151120d9ca0 Mon Sep 17 00:00:00 2001
From: Barry <wangbarry@google.com>
Date: Mon, 1 Apr 2024 16:15:36 +0000
Subject: [PATCH 1/3] Bluetooth: Enable BQR Stats event and Disable
 BtHalBqrEnable

this patch is to cooperate with Bluetooth Stack pre-build for BQRv6

1.Enable BQR RF Stats event (bit 8 = 1) at BQR event Mask
   0x100 = 256, default value(295006) + 256 = 295262


2.Disable BtHalBqrEnable to disable config BQR from HAL

Bug: 332305546

Test: Manual
Change-Id: Ie9045b15bd9093a12d61eab592d29684c751e77f
---
 bluetooth/bt_vendor_overlay.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 318eee5..1b86112 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -13,7 +13,7 @@ AocPowerPinCtrlCheckEnable = true
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 295006
+BqrEventMaskValueUpdate = 295262
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
@@ -23,7 +23,7 @@ AccelBtDisable = false
 
 BtHalRecoveryByRestart = true
 
-BtHalBqrEnable = true
+BtHalBqrEnable = false
 
 # <string> The hardware stage with old chip revision is no longer
 # # supported by BT firmware.

From 17009d25647969f072b0449c04c386276ed1bad5 Mon Sep 17 00:00:00 2001
From: Massimo Carli <mcarli@google.com>
Date: Wed, 3 Apr 2024 17:16:24 +0000
Subject: [PATCH 2/3] Update available font scales

Bug: 332564216
Test: `adb shell settings get system font_scale` returns 1.1

Change-Id: I94b31bf0aeb759449a4ea9c7194885ff0b3ee33e
---
 .../base/packages/SettingsLib/res/values/arrays.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/comet/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml b/comet/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
index dba2a76..9b07a1a 100644
--- a/comet/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
+++ b/comet/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
@@ -22,10 +22,10 @@
     <!-- NOTE: if you change this, you must also add the corresponding scale key and lookup table to
      frameworks/base/core/java/android/content/res/FontScaleConverterFactory.java -->
     <string-array name="entryvalues_font_size" translatable="false">
-        <item>0.85</item>
         <item>1.0</item>
+        <item>1.05</item>
         <item>1.1</item>
-        <item>1.15</item>
+        <item>1.20</item>
         <item>1.30</item>
         <item>1.50</item>
         <item>1.80</item>

From 25f90bbe3276fe99858af626828e596c03ed8bd1 Mon Sep 17 00:00:00 2001
From: Nikhil Bhanu <nikhilbhanu@google.com>
Date: Thu, 4 Apr 2024 17:02:24 -0700
Subject: [PATCH 3/3] Spatializer: Update configs with latest tunings.

auxel commit hash: a2a693b
auxel change ID  : Id6f1ffa47e7ae03272a663a9996c885cee313098

Bug: 330199578

Change-Id: Ibc0d89cadfa63287ecd14fcb9aa59e2b0d9c4e6e
---
 audio/comet/tuning/spatializer/base        | Bin 3448 -> 3912 bytes
 audio/comet/tuning/spatializer/mode_2_ch   | Bin 924 -> 916 bytes
 audio/comet/tuning/spatializer/mode_6_ch   | Bin 764 -> 784 bytes
 audio/comet/tuning/spatializer/mode_xaural | Bin 1004 -> 32 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
index 1de44740c031027a385ed9ad3c15d9d6c2d16b9e..38cc646e1f4db548866aac2bb32c0836467df2ba 100644
GIT binary patch
delta 836
zcmZ`%F-XHe6#bXnT`x2Nr4htxs!qBI)uK=_#k#xepdh7=I#;aV;NtYximRiLRfi5@
zS2qU*2M1Tdp^M=Ev5}g#2Y2u1-OKy`{#|#f6WmIn902f8*m-3rayi1Pm{m4?Ie28{
z@jx^qX}t+y<AZ&T=W-Pr%EW>y9;yO%q>nA-;s@a!p;11*5H1i-YZvRvpJVe-0I=;Q
z&2gHOG$mL7`<Icy6IBofuj2JSUSH#NMi(gax-MXuy|j<JgcpPj!W+UCVMi~EZ1k;n
z#G*rXWE!V%2?cC{O&o>)IEiN_hfO2b(rQg=nNnwnQ$5Znv>^l=pG<y{y)`j3+H}G=
z$FHIi=VkX=O@{*8W+fQZNcum~VAqs}NL0UM$r&c$n*UttPHBEH5g#FuaG}wc^KMaZ
zg_px;cN@!I`IPUazj$s#u~^(lAB>A0wa3-+9zb*8zofOpJgL55q$zh<;HR0$RDhEw
wF(-@T;|j1j7s?}DFdsg>H%2-OLhxvhA0`iOK*GB{elK|JGM~JrEb)BfKaC%Ry#N3J

delta 397
zcmZ9IF-rqM5QS&&b~k(BP9k@Lc$$k{8cVx~2S(7&La<RVg^)Ill|=*#8>`p)15yUA
z)xt)CoqYrg3x9&3f^QG2EX;nhZ)Rs^ch>$|n`&i35lNuJ+(h(Z@1d_cxKU%{s6-eA
zd8LDQ1+B-*;X<FN5O2ER{#)-G#``;_*!0CpCE_pkY0I=#nwCIha94#mGX>^4#>8a!
zA!p>eiSbGHNM|!VXjix1!y&V~R8DP-1M-R-lK14T&m<={<5Z7!7jx?>-8kl(*ebxt
zrM`bXL`*8#7lUh;Zdo5+h%~6_1<g@2Sc$grywt*F)UEmQ&vvsuhov~Yy1eVNEh~t0
ip7;lK-xe82DKTUIbGW{%Ve=!vd2+<D2T6))()$CRtWp*L

diff --git a/audio/comet/tuning/spatializer/mode_2_ch b/audio/comet/tuning/spatializer/mode_2_ch
index 74733d6f0a12e0eda9ad3eea0478bc99477136ed..470c56cfb061951dd4509b49cfaa8391751f1c52 100644
GIT binary patch
delta 120
zcmbQkK81aP4kPnKN8yP&5)-EgObpSOI6(s_uv40cC9!ui0}z}&qvbR?fKg=P7m0}<
zxF(A+3Qgu=<d|&0D8k4*IgwF%vJ0cr<V8Ty8H^&6PcRC|w#{K=U<7Ie(Skr)0f^Zc
Q92j_k1~P5_%Q&AA028Sny#N3J

delta 121
zcmbQjK8JmR&O`@^i7o;YGc*`ECQcNdI6-4_0wc@BJrWZ?aIl;`qvbU5kJQ9pLX7N_
zc^Rb{IVNi|N&^)*P0nHzn!JTkWbztD4xs2(MrBoV9u@{h1_lNYEeNDFfS7~9fq^%%
RcQX@^4Fb%YzcS8e1ORq%9oYZ?

diff --git a/audio/comet/tuning/spatializer/mode_6_ch b/audio/comet/tuning/spatializer/mode_6_ch
index 68b9b3f5432717190df24b6eee769beb59f126d4..94ec6356a9895665cd1dde568bbc5282d341ac0a 100644
GIT binary patch
delta 159
zcmeyvI)QD14kPnKN8yP&0TU-^Oio~Akz`>2fd+d<ASnpMB0$W{;K;x{ai=s7OJeV4
zAfMsvnG24S0~kdnevz2?forlDqtIj?Mvln_j3SK8lM@-GC%Z5@O<n{Poxvz#Yyi~2
l#o)le3)jrU05bjT86E~EAT43e%mA_##Ak)jlbM-*0suSeBZL3|

delta 151
zcmbQh_J?(X&P0a*MvjS&!V@QGO#HyXl9qPr;KV-?6Mu*>vQ6e?l%9Nnk!7+DqXZ8}
zV((@KAUJ#Gm(#=tB9j{!?Ive23IXLsI7NWs%nXhU9Fs3H3R_zMc{~gb47^YspVbr?
Y7=dCSnh8oXLunQ$%?hC>i!=QM0Ccq{761SM

diff --git a/audio/comet/tuning/spatializer/mode_xaural b/audio/comet/tuning/spatializer/mode_xaural
index e630d49e07d54d115db578dfacfa772097e25849..b3a3a962e37c8aca8a8d1710f622c24f28343c56 100644
GIT binary patch
delta 15
RcmaFEt}sEIvw@KT0stI@0!07-

literal 1004
zcmZ{iJx;_h5QQhZ3E@|;XbTD?I0I>D5DpCuhkzy>cgO{}!&a2raDj!2Vz~o{Kol!Q
zVm?n+M0RY+8T-8%=RJ>SB66lP7bo+lmp5Jdky&VG8V_}5QcA8o_z){bu$>XC9Km)+
zu>BG2V1QkFJ+({})1{78XIfX?#P8c|>ZAPT7Q3R4=$`AGO6|QE{Q181wB_*Bb9Kn!
z4X$ZkZ$l1`R=4>GIlT7VUC42-XsxO$Iuk7^4lTXMs17ZuI<%xXv~Yi4>xbw}w4^w+
z*uA$=9a^kzeG_^|OUPM|og690ojsrO{w&gC_S6vZvAimU9uxn2?0k>ei(Cf%aDtZ<
zhnEzGmlTJWkUQ7E7y8~#ltT$VHY}vox$t_2Iq-}hT`ccwU42J6_RdAz1@ExYOc&+s
OX(f4!WBvGlJ<1=zh;tGE