From a8d67857782896740f3a7c4a0a4057a9ffc5fbe3 Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Tue, 12 Jul 2022 16:11:32 +0800
Subject: [PATCH 1/3] audio: update speaker bins

Change list
1. modify Rtrace in cali/diag.bin

Bug: 223513454
Test: manual

Signed-off-by: Yung Ti Su <andysu@google.com>
Change-Id: Ia6f0c6346b58f6e149a7fbe41f360d4ac92d99f9
---
 .../cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin    | Bin 1860 -> 1868 bytes
 .../cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin    | Bin 2620 -> 2628 bytes
 .../lynx/cs35l41/fw/cs35l41-dsp1-spk-cali.bin | Bin 1860 -> 1872 bytes
 .../lynx/cs35l41/fw/cs35l41-dsp1-spk-diag.bin | Bin 2612 -> 2628 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin b/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin
index dd9dd0446c7f69eb27e7f443bfeb30292dd4979e..a21012f937ec52d70e434fed248c30bd4ffb340a 100644
GIT binary patch
delta 158
zcmX@YcZP3*0%PDrMO6bcBa3+V{QUHs)Oa65gLv1l5W@n4_@w-j_@I)a#N<>{<J|m=
z-1y|goJ_r>%shsPSy~)|0t~DTN^BY%=WsDGdTn0L<jctDHu)=az7VEqn=4p~nIwSX
tN;+IhC8c?pdFk<)DN0rfN(L2%hLf4u4fsthP0URU%*~CJxM~>~7yv1rEj0iD

delta 150
zcmX@ZcZ6?(0;AhRMO77JL$i4I{QUHs)Oa65gZO}={E~db0)zOZ{F3<O#GFjMq|CgD
zWm+5z0t~DTO3Y##S8y>gGHl+=<jctDIhm0qUj&;8o10jQnIwQRN;+IhC8c?pdFk<)
iDN0rfN(L1M29tT&4FnC1%uOwgEX^$pmAGmdfB*nTNhyo~

diff --git a/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin b/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin
index 76e0e0356319140ce46e8fa76039b38a7a1f0f6c..7562b94d42377982a9192d4881225595c3122f51 100644
GIT binary patch
delta 129
zcmdlZaztc;LU<qp1B0_wOlWaxQE^OVPG)J0OKNd;Nq#|$dwza;PHK#gp+Ss+nUO_2
zgdY#&$Ge7w7#0}BC*_yK2bB~hCa0Pj=jLbR#;0T^rt2kT<}omA%)iFS=(X96shyR%
b{{R2Y7ue&N_zVp!jSP&<EKN+6xM~>yIEpIY

delta 121
zcmX>ivPWcsg1<Kd1B0_wOlWaxQE^OVPG+f|qf3lSYH@Z+enE_Zv4KUrdwza;PHMc5
zp+S5=QGQ8&yi<NjNq%m;bABFBQ(0n3W?5={N@ilZUQ%Y>#`0^7j0~IonA%yH8yFZi
Y-(Zhp;?uP>HL<ibwlp$U;;Ll;0O`ahoB#j-

diff --git a/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-cali.bin b/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-cali.bin
index 0138db551cdbf5585155a40b78cb4732542e9795..629da3afba7b803b57384e8f498da1ee8719bcad 100644
GIT binary patch
delta 193
zcmX@YcY$w$0%PDrMO6cHL!)^2{QUHs)Oa65gLv1l5W@n4_>%mB_@I)a#N<>{gWUX#
z-1y|goJ_r>%shsPSy~*73=FIdN~{VS=WsDGx@}(0WW^{_|NlP&1H&I6h6B&ZUzzh2
zOpOeXEeI&eFUf~lQBs<hy1A7lok;?yN=b)H2`G@6mmZ&)qGY9@WKdyXIGKgrK+w?A
R*wD<}(!$bMiK`Z5JOKM0Hi-ZL

delta 181
zcmcb>cZ6?(0;AhRMO77JL$i4I{QUHs)Oa65gZO}={E~db0)zOH{DS!8#GFjMq|CgD
zWm+5z3=FIdO3Y##S8y>gGHl+=WW^}b02E|k_yZ=Pg!g1dmV8CLhGrxdC2pR;lFlRn
wRHmfErBqUymzkFypP8a$rJ!U`VPG(spWQ$}*U-q^($Lbx+}K!&tCoQQ0Q1i<B>(^b

diff --git a/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-diag.bin b/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-diag.bin
index a96e9c9faa038243a2312244db1217375f89d6f8..6b9170fcec93ebc4b763cb081f90ba3037025b7c 100644
GIT binary patch
delta 131
zcmdlYaztc;LPQ_~1B0_wOlWaxQE^OVPG)J0OKNd;Nq#|$dwza;PHK#gp+Ss+xuH=!
zgdY#&$Ge7w7#0}B169Qbl@ui=r<xk%=4a%_r(`Ck>m_C80nOZ)bCr?NZL<^8ELO(Q
a&3D<om;?<iO^wV=EzFFJmAGnwN*DlH@F>3k

delta 115
zcmX>ivPEQqf{zCS1B0_wOlWaxQE^OVPG+f|qf3lSYH@Z+enE_Zv4KUrdwza;PHMc5
zp+S5=QGQ8&d`NylymNjYP)Au}NoHAUd`f0wx?WOd-o}cnjEoGM{g`I4GKOq^$?nC(
SYh++zVq|1!X{N+g%K!lGwI%5Q


From 684e46c4cf611a3797b5bc4d8385bf1543b4a740 Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Mon, 1 Aug 2022 14:59:59 +0800
Subject: [PATCH 2/3] audio: update speaker bins

Change list:
1. Bot spekaer model for EVT version

Bug: 223513454
Test: manual

Signed-off-by: Yung Ti Su <andysu@google.com>
Change-Id: I9b0e79d296328e790b01e33f84d86aa18b572d8f
---
 .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin    | Bin 5172 -> 5144 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
index 6ed69e865bb2205645ba3817f3e7df6a632289b6..2c40a73694003575b99170757f3b1f28612d31e6 100644
GIT binary patch
delta 845
zcmdm@F+*d50;9`BMO7s;Ba3+V{QUHs)Oa65gLv1l5W@n4_@w-j_>$7RRK29kyon7O
z9D)K2tPM(R8XGr=uu5?7ePa+{U{L5VW&i>OMnMJ!K?Vh8(am>QmoTxgF#P*HxrM`}
zUKl9(JC%WnL3TAr9TH&v4CV-ZWjMp2yo!MbWEulQGy?;#<1YpVX7gZ%=Zr0z-E0_w
z8I<lYL@)?G<qiR=0wFlqz_5!!tZ{QLg9BsXEyj-wna_CEFvv1+{$NN3D!h_;t^P~&
zo15ABiUk51xqQ1>qW^Q1u?W91<7RGUmP%pfVHUM5yvo3k^Uj3VBPsVq8<W1OpnI~o
zBnQXrY1`O4*myUwZDqZ?hJlCmilnzF!*hP)jEHjrW*pyc^2M;LUd?Z3Uct=uf%zxX
zg{eDanRWy1WMTw4jtNAtGKexvKE}C^QDJf`*Y0r5cU$TijIT&CusZ-Hxf%391cQAi
z0|PtAPh68bK$;i=fNW-vz`+n>usMr6GIN09XJFzjR{9J(Dn;Mv?*JO1zhm-rZeym~
z?<Sw&F3|x-1z2Nd4$uK-7Iy#*0s<b8RXn2aTC9M|D}lOpFi11#PtM^9Wj`IjaFT)T
z?c@_Y2^=DCfNB*CnI{|Y*3^6JGBAWJH<=NZw{+FgRTHBa7>x3OuI0Y}3K&{~MLl5g
z)d+D?)B~N!2U8!%m>8D`B!K2K0>yct=3DllOAyciS3fz0?;!uqdG(Xio>k3!>E6b`
zU?#oUgnt2}X#M~H96%rb0R;&RI8S~lkS~Op`ZwnY7Bh(h#g%lplz>?vGcP?pGeyZt
dLCK)PaPl`{U4BC&QzLT|0}CS~C9YZq1^}70+}Z#D

delta 815
zcmbQCu|;Eo0%P<<MO7<PBZGMN{QUHs)Oa65gZO}={E~db0)zOZ{E~PBV?(o&(!A7o
z1E4B5&!G4a*WeI;Kc7gwq|7{qi5VIki~<a-4N9yE8)t~HN^s6$W)NUtP-vaT00at*
z4;dH)85EeNZa%`ggo%Zn;opzRIUFuBmw}SM=QA)e$l8I_Apz#x$!9nu>%TBCFq<7@
zn8w)B?6!{~gh82`A(}z(3wJmJ4+99n!8!(A2C=kl3m6<33v(IYFl4Ub*~TEtz{Smw
z3{-d}^V*l_H#f5t6bl42D*1M^B)V|zW|2H<t<K!VET6;7!z|@pc$I-6=bZ_!M^f&K
z*0uVog6{d^7784K{_{VwPht~0#I}p|*-{1`*1MA4q72XZjWZ(737BzwJHdCFUG+-w
zI_A~Pe7BizF<q(N!^*UO@*K_!j1rS`xpqrvOIp`67{%;kV0QqzmYd-Nh+r^vpX|Ub
zsaE00APy8gusFK{NSy}yh#BOq=D9Z*a;n_z)pHos8Pszo*K->)rJk9*g}X$@5$x}S
z71<R)ji(PR25JBT9)=r0!ri`kE>L+DP*)CvG=uu&5S~!>RrL%f8D#P%Z{SJbn7R|F
zR>6>IvIK8UJxdY;L#WvG8IgH6mfu)DQJsOoC=ci|?oDjKfbfdzK^G@QJ<tz)F!f%H
zkzSEN0%$%XP@D&9zGV-(1OW|j^^<-04)UKnR{uNQTIx-fhYJIPnapMx{soMp4Gat%
zKp*}AVmNS{d{H1@1Y6qP93)uGBo35O(&179Chp9<^!UsaB`XCbg9?MmcZ78Xbq&o7
R42+BoER4;RxN3n$0svpG*DL@4


From efa52cece3ef8f5e46818fa14cfccc8385191506 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Mon, 1 Aug 2022 14:21:11 +0800
Subject: [PATCH 3/3] Remove AIDL support on IBluetoothCcc

Bug: 239658601
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: Ib0634920e60e58db5e0fc70a4d16afef5ba80a0f
---
 bluetooth/manifest_bluetooth.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 2d055f4..2033d87 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -26,13 +26,4 @@
             <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>
 </manifest>