From ed7030974bd7a295ecdbdd7bb868902bc4f3dcd9 Mon Sep 17 00:00:00 2001
From: Nikhil Bhanu <nikhilbhanu@google.com>
Date: Mon, 29 Jul 2024 10:06:44 -0700
Subject: [PATCH 01/11] Spatializer: Update configs with latest tunings.

auxel commit hash: dbb98fe
auxel change ID  : I1da381578bb2e847e153e349834e2ca3de9edb3f

Bug: 323417281
Test: manual
Flag: com.android.media.audio.stereo_spatialization

Change-Id: Ib16c659b4161e5c02f9ac294c1a986d4c31cc4c0
---
 audio/comet/tuning/spatializer/base        | Bin 3912 -> 3932 bytes
 audio/comet/tuning/spatializer/mode_2_ch   | Bin 916 -> 936 bytes
 audio/comet/tuning/spatializer/mode_6_ch   | Bin 784 -> 876 bytes
 audio/comet/tuning/spatializer/mode_xaural | Bin 884 -> 904 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
index 38cc646e1f4db548866aac2bb32c0836467df2ba..42b4329ea36e5fecc745f6fc0b7e8e4f6e6c745f 100644
GIT binary patch
delta 28
icmX>hcSml62fv6Q0|NsO5Hm9HF)%3WZgvfJbOHcZQ3XZ-

delta 7
Ocmca3cS3H12R{G}&I0HF

diff --git a/audio/comet/tuning/spatializer/mode_2_ch b/audio/comet/tuning/spatializer/mode_2_ch
index 470c56cfb061951dd4509b49cfaa8391751f1c52..2610b2d9c3640629ea95de3ff896ca0b577e24b6 100644
GIT binary patch
delta 242
zcmbQjzJh&&4in4SGd%w%8!$<P7%?y~oIR7nFk|LTCP5%u28dZ192o=>dp9!y*&q-g
z!oV=$P$*E{ng8f&m?26SzA!Q{a9w}QaOO-8<K#I^3e0EDoSD3zNl|^)Oi4y`O>9t2
zd_cyRzgs}O$?VLs?B6uz039MZS({lAXl}z~e`ZMs0d<HPW8=*XAaf*um<8xSL7)Rc
c8i9ZnXg8P!$@2g)BLg1;gR<^sCj&hr0Db*3>;M1&

delta 222
zcmZ3%K81aQ4iigSTH3$K222tm8Vn2!QzTq~<N+2zASnaHtPG9}0*SqwnSg8%$OK{s
zQ$8kR<IN1{YM8+)7#JQfGB5~4bTXVd!^1Rr4wC{<ykYWwCPj51&4{jv4XWu5D+9xq
zzgrkG($priGt08uaxDkSG)&fJR%D(vbLM1!W=S0fd5D^{v}It+C4eeefDRM{IuK+`
MMp_y(&~7jd0OO)6+5i9m

diff --git a/audio/comet/tuning/spatializer/mode_6_ch b/audio/comet/tuning/spatializer/mode_6_ch
index 94ec6356a9895665cd1dde568bbc5282d341ac0a..0f432fa304e5127ccb5fee9bf86debcb19f8248a 100644
GIT binary patch
delta 260
zcmbQh_J(c3J;p~9?@Kbzn)!6%ZxAK9S)5UlkvoNffx+1LGmtzm*_ug`M}e7v!6_jW
z$Zz;JIe|%{o`Dx4kdgN6w;)hh28dZ192o=>dp85sf&mX31H(FZM-ZC{T@4FF34?<?
z0|VFf#~>afx*Arf8X+bIhIcjjj6lc0)X2gu1KI%w(?l2;($d%%fnH#oe1=Ja=Q%qA
i!<WBXfRYUilRq#ih=7de0b)i5J_ZJ5-OWyhdZqw$8ZoB;

delta 192
zcmaFEHi2!zJ;qZL?@KbDJ#%5=Z%O8~v}K#c86_FHe=&eS1BjSx%_Pa=!@|H|Y`hu7
zXPlhCBvJ1m&%ltDmd41yaDYJ&C@KTQtPG9}0*SqwnL)~c;DH`Y4Fe;(8lZV#uz;U|
gVV%1pkbU4Ex*ATPC=(Ea)Ic2rHb(;JD0^l}0Q@Z?A^-pY

diff --git a/audio/comet/tuning/spatializer/mode_xaural b/audio/comet/tuning/spatializer/mode_xaural
index 551959c200543540eabe0a7000e962b1c488a6aa..2d1e1dac46b5a8425904840d6a5636d7717f6be7 100644
GIT binary patch
delta 28
icmeyu*1^7^gjqz8fq{Vsh#4997#NgwH#0D}MF0R#(FBqJ

delta 7
OcmeBR|H8JRgc$$}zyh%V


From 7a49f49dc9c3fd1148e4cea2c5c7ff15bc981bc3 Mon Sep 17 00:00:00 2001
From: HW Lee <hwlee@google.com>
Date: Thu, 22 Aug 2024 18:20:11 +0000
Subject: [PATCH 02/11] audio: pts: waves vol: comet spec xml

Flag: TEST_ONLY

Bug: 343634539
Test: ABTD
Change-Id: I2a32f62fa2f62f9359c945c2bc758daa1b5b5491
Signed-off-by: HW Lee <hwlee@google.com>
---
 audio/comet/audio-tables.mk                   |   3 +-
 audio/comet/tuning/Android.bp                 |   6 +
 .../speaker_post_processing_volume_spec.xml   | 114 ++++++++++++++++++
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml

diff --git a/audio/comet/audio-tables.mk b/audio/comet/audio-tables.mk
index 49123f8..ee2527a 100644
--- a/audio/comet/audio-tables.mk
+++ b/audio/comet/audio-tables.mk
@@ -76,7 +76,8 @@ PRODUCT_PACKAGES_DEBUG += \
     template.xml \
     tuning_constraints_combination.xml \
     test_config.ini \
-    test_preset.mps
+    test_preset.mps \
+    speaker_post_processing_volume_spec.xml
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
diff --git a/audio/comet/tuning/Android.bp b/audio/comet/tuning/Android.bp
index 9408763..cfaf6b2 100644
--- a/audio/comet/tuning/Android.bp
+++ b/audio/comet/tuning/Android.bp
@@ -143,6 +143,12 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "speaker_post_processing_volume_spec.xml",
+    src: "pts/speaker_post_processing_volume_spec.xml",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config_nx.ini",
     src: "waves/waves_config_nx.ini",
diff --git a/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml b/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
new file mode 100644
index 0000000..5bda1b0
--- /dev/null
+++ b/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<xml>
+    <spec feature="normal" device_state="OPENED">
+        <vol step="1">-55.3429,-56.462852</vol>
+        <vol step="2">-51.476486,-52.629974</vol>
+        <vol step="3">-47.429344,-48.577915</vol>
+        <vol step="4">-44.404938,-45.54104</vol>
+        <vol step="5">-41.34484,-42.47274</vol>
+        <vol step="6">-38.26381,-39.386524</vol>
+        <vol step="7">-35.17891,-36.297333</vol>
+        <vol step="8">-32.07109,-33.184692</vol>
+        <vol step="9">-30.30139,-31.407984</vol>
+        <vol step="10">-28.531578,-29.626408</vol>
+        <vol step="11">-26.762623,-27.840538</vol>
+        <vol step="12">-24.994268,-26.05007</vol>
+        <vol step="13">-23.22528,-24.253963</vol>
+        <vol step="14">-21.460478,-22.458183</vol>
+        <vol step="15">-19.69938,-20.66309</vol>
+        <vol step="16">-17.927505,-18.85597</vol>
+        <vol step="17">-16.149855,-17.04668</vol>
+        <vol step="18">-14.375043,-15.242476</vol>
+        <vol step="19">-12.619692,-13.460893</vol>
+        <vol step="20">-10.988443,-11.807947</vol>
+        <vol step="21">-10.229917,-11.031332</vol>
+        <vol step="22">-10.067055,-10.8566475</vol>
+        <vol step="23">-10.010124,-10.794648</vol>
+        <vol step="24">-9.965792,-10.748672</vol>
+        <vol step="25">-9.924187,-10.708454</vol>
+    </spec>
+
+    <spec feature="normal" device_state="CLOSED">
+        <vol step="1">-56.824966,-56.22085</vol>
+        <vol step="2">-53.00812,-52.39601</vol>
+        <vol step="3">-48.99447,-48.376297</vol>
+        <vol step="4">-45.98986,-45.365585</vol>
+        <vol step="5">-42.94967,-42.31531</vol>
+        <vol step="6">-39.888924,-39.239597</vol>
+        <vol step="7">-36.825584,-36.154556</vol>
+        <vol step="8">-33.740566,-33.03967</vol>
+        <vol step="9">-31.983803,-31.262745</vol>
+        <vol step="10">-30.226,-29.482727</vol>
+        <vol step="11">-28.46655,-27.69943</vol>
+        <vol step="12">-26.707556,-25.915329</vol>
+        <vol step="13">-24.945498,-24.127829</vol>
+        <vol step="14">-23.18879,-22.34605</vol>
+        <vol step="15">-21.434853,-20.568602</vol>
+        <vol step="16">-19.676136,-18.789795</vol>
+        <vol step="17">-17.923016,-17.019646</vol>
+        <vol step="18">-16.179115,-15.263374</vol>
+        <vol step="19">-14.411232,-13.477808</vol>
+        <vol step="20">-12.608496,-11.657543</vol>
+        <vol step="21">-11.418643,-10.450487</vol>
+        <vol step="22">-11.115015,-10.132849</vol>
+        <vol step="23">-11.049253,-10.054632</vol>
+        <vol step="24">-11.009314,-10.004243</vol>
+        <vol step="25">-10.979197,-9.964965</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="OPENED">
+        <vol step="1">-48.656296,-50.673286</vol>
+        <vol step="2">-44.69299,-46.81315</vol>
+        <vol step="3">-40.618153,-42.763763</vol>
+        <vol step="4">-37.65023,-39.806267</vol>
+        <vol step="5">-34.71226,-36.89866</vol>
+        <vol step="6">-31.792694,-34.008415</vol>
+        <vol step="7">-28.87659,-31.105488</vol>
+        <vol step="8">-25.919016,-28.141272</vol>
+        <vol step="9">-24.223642,-26.43234</vol>
+        <vol step="10">-22.520838,-24.709074</vol>
+        <vol step="11">-20.81106,-22.973286</vol>
+        <vol step="12">-19.082249,-21.21807</vol>
+        <vol step="13">-17.333406,-19.4436</vol>
+        <vol step="14">-15.581524,-17.667053</vol>
+        <vol step="15">-13.825251,-15.887933</vol>
+        <vol step="16">-12.092208,-14.131317</vol>
+        <vol step="17">-10.732493,-12.741249</vol>
+        <vol step="18">-10.100718,-12.073996</vol>
+        <vol step="19">-9.911014,-11.864244</vol>
+        <vol step="20">-9.836917,-11.782432</vol>
+        <vol step="21">-9.779734,-11.722244</vol>
+        <vol step="22">-9.734992,-11.677365</vol>
+        <vol step="23">-9.6985,-11.645135</vol>
+        <vol step="24">-9.66777,-11.623802</vol>
+        <vol step="25">-9.63527,-11.600014</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="CLOSED">
+        <vol step="1">-51.52192,-50.394104</vol>
+        <vol step="2">-47.673805,-46.551804</vol>
+        <vol step="3">-43.651005,-42.548542</vol>
+        <vol step="4">-40.702824,-39.619167</vol>
+        <vol step="5">-37.78776,-36.72528</vol>
+        <vol step="6">-34.883675,-33.843998</vol>
+        <vol step="7">-31.96994,-30.95195</vol>
+        <vol step="8">-29.008202,-28.005291</vol>
+        <vol step="9">-27.310637,-26.311722</vol>
+        <vol step="10">-25.606598,-24.60886</vol>
+        <vol step="11">-23.898502,-22.899467</vol>
+        <vol step="12">-22.189236,-21.187288</vol>
+        <vol step="13">-20.478073,-19.472952</vol>
+        <vol step="14">-18.775997,-17.768572</vol>
+        <vol step="15">-17.08199,-16.07426</vol>
+        <vol step="16">-15.326209,-14.307854</vol>
+        <vol step="17">-13.593147,-12.561827</vol>
+        <vol step="18">-12.172909,-11.130552</vol>
+        <vol step="19">-11.557884,-10.508577</vol>
+        <vol step="20">-11.353183,-10.2964</vol>
+        <vol step="21">-11.280718,-10.217085</vol>
+        <vol step="22">-11.227874,-10.15811</vol>
+        <vol step="23">-11.186886,-10.110628</vol>
+        <vol step="24">-11.15273,-10.070196</vol>
+        <vol step="25">-11.126692,-10.037739</vol>
+    </spec>
+</xml>
\ No newline at end of file

From 8deeb016d02fbfc8215005312cec666de871f215 Mon Sep 17 00:00:00 2001
From: weichinweng <weichinweng@google.com>
Date: Wed, 28 Aug 2024 03:37:35 +0000
Subject: [PATCH 03/11] BT Offload: Using other flag to control BT Offload
 feature

Bug: 362627875
Test: Build pass.
Change-Id: I8960341f6f72a51d952e625e79bbf62ffd0f52e9
---
 bluetooth/bt_vendor_overlay.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index d565ec0..eec5b46 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,7 +14,7 @@ UserialTypePriority = 2-1
 BtOffloadCap = AOC
 
 # <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 24P_AOC
+BtOffloadTrunkGroup = 24F_AOC
 
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true

From a54d98f6d878b38aa88a41e419241f37db68d966 Mon Sep 17 00:00:00 2001
From: Ankit Goyal <layog@google.com>
Date: Wed, 28 Aug 2024 22:50:58 -0700
Subject: [PATCH 04/11] Delete mapper4 manifest

Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: I135580fe6f79ee55c0300eecf2ef521a4c2afa96
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 9f8994b..cf97ba9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

From 1ae010799e07d198be24c7c611b9905f42ea1159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Fri, 30 Aug 2024 21:06:35 +0000
Subject: [PATCH 05/11] comet: Update APMg3 tuning files

note: version 240830

Bug: 295551854
Test: Manually tested by sideloading into comet weekly build.
Flag: EXEMPT voip feature

Change-Id: Ib41eff1d02a6467ebf092e2826a3565a3be499d1
---
 .../tuning/apmg3/downlink_handset_config.pb   | Bin 597 -> 597 bytes
 .../tuning/apmg3/downlink_speaker_config.pb   | Bin 629 -> 1143 bytes
 ...uplink_bluetooth_headset_aec_off_config.pb | Bin 1828 -> 109 bytes
 .../uplink_bluetooth_headset_aec_on_config.pb | Bin 1828 -> 213 bytes
 .../apmg3/uplink_dock_aec_off_config.pb       | Bin 1000 -> 121 bytes
 .../uplink_external_speaker_aec_off_config.pb | Bin 1854 -> 121 bytes
 .../uplink_external_speaker_aec_on_config.pb  | Bin 1854 -> 239 bytes
 .../apmg3/uplink_handset_aec_off_config.pb    | Bin 2906 -> 121 bytes
 .../apmg3/uplink_handset_aec_on_config.pb     | Bin 2906 -> 928 bytes
 .../apmg3/uplink_speaker_aec_off_config.pb    | Bin 3783 -> 121 bytes
 .../apmg3/uplink_speaker_aec_on_config.pb     | Bin 3783 -> 3836 bytes
 .../uplink_wired_headset_aec_off_config.pb    | Bin 1828 -> 109 bytes
 .../uplink_wired_headset_aec_on_config.pb     | Bin 1828 -> 1121 bytes
 13 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/comet/tuning/apmg3/downlink_handset_config.pb b/audio/comet/tuning/apmg3/downlink_handset_config.pb
index a5c2545a51c45f73f9a7529f3e73d583e7467866..0b622accd5c09da61299ed3e87f52ef3e4153319 100644
GIT binary patch
delta 545
zcmV++0^a@A1l0t83Wx*<fcF9r0wVtd3j70@6iz>nO%%O)ZRfq#_CCD6_vJlIO6NVi
zC3Zc)!uGq7_PaZI5{$j;n!~+T;CVc~$J)HaYQMZm8%;eG(I>i2>|?y+|IR$z7pFTR
z7iPPQJG(sWWK%rxH&Qz**7Q5~*vvbwmVrAfiqpAt%>_Jv-9bw`dJSs3515BKdq;4)
zv=gzrYJZTs$(l>Ms~ms3v#)}?6CLup5CQ7CZ)J(Pw70FfF7lx|hbS^SnIb1T`3~Va
z3^AxW5f8LFp#HNuacJ8*1D9wzwjUijvY&%GPe}|q;u-omlm#C;pNtkdVV5|#X0Cv@
zE|pL?rM~KaxeUh`xjL??xUrXcxe0{~xiF3ZxX2S$w#@??IA9q-H@;wfIMAm0I0vnd
zIE10AIAt@*I6M#=ILrpyH&-|lI2}xqHK}_px96>yHr#wjw+_~%w~=-$w=5raxAoMp
zx7ja_x5yJ#x1y1iw=8m7x82U)ws1KIx3>Ixw#RONSvAc9%r&CtJ2v{mrZ!1uqBbA#
zjyAEhoi++Kg*GMLXf~C<RyK0oH8$$^5;ljI@ilkMt2NY?J~e(|9yKAB3p6A-?6Y^w
zE3)hLcC>fQtF&BvVYDHZi?nK_#<V0kY_tYOLA2}jcC_eHma})vE3#SH0JC?@D>Ie9
jRx@`N%&RhY%&RhY%&RhY%quby1q}cI06>!x0zv@=0SN$~

literal 597
zcmd<;VBu)^&LqI3^q-mQ4>Nz=BXf4AO%{&V_gU;UZ?l*a&|%>z{N92)mebN8X}<Xk
zQ^TF1S!Fw;ntFEZl+m~BzNcx~en4>NxAT{GUVA!aXY<ls7H8L}S_1X&+@)8uYa+Mb
zE<f#7%S}2ntgaQ-SS{(<vE6H$@UFd9?mG=q6To_bX6%|_x^ZX8HU_Kj{jFB#e*d@P
zI5FM&XxVpbh0C|B58XRrW%Pn&_oRu&Ruft?tc3+8@1F8&(;mjwUwiV5r|vNhWU-br
z*=@Zr>&tHTS0a0?So&=A7%gmt?r_*{^>^R%@UqNa#WJ-$dB5ds*I#hA<-eF=v!+OK
zPvI(48}AY^+qj+gtc&h<?bYx|u?Nv0K1duS4^jtG57GzH4>AX29>`pf`5=2h_JQmL
z*$;9D$UPu;f!qgjC&;}ZcZ1vy@(0L2Ab)}U2l6M#zaW2u{0|BTP<VjC6cj$7Z~}!F
zDBM8d2MR|}c!I(e6uzKv28A~$+(F?FiU*KhP`rTR2NX}B_yWZnDE>h42#QZoyn^Bv
z6wjde2F1G&D=z~>gT0gjmmHVOlAs(L_RAY=?(Al>U3JaLcD?gd+r=lJ+U}p#Y^TJ+
g!6d+_#lyiM%D`~KNp{xEnRW(QR-9mdgS`YJ03oXd5C8xG

diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index 53b94d0517a889d5b2aec53ca734ff23d5cc54cb..522c72120b80e99b3673076e822117b099476afd 100644
GIT binary patch
delta 1060
zcmXAnc~BE~9K~s{48kCXl2ADW1redZkYw)=jsjjOpfrHcL8h%!7%Nsp1Y;Ax%0xt%
zaw*hF3W{i2Ig;#dHoJfbt%V?Ju^OS&+R9~R%18!LkZ#&P-prfd`@VmE?_*iBXfJm-
zYj3Yu<hXD)ui82++XAXsu~)$=qX>OO$4_h(5yMwSVUGeMi&Mt1x9})xQTH*|+d>)F
zya_tb-ANQUp34k%9bt++i$r{2!C3SC0h(HJ7X|Seu;DlWotG;yv)ku%M$|UUHBpAS
z+o`Y+`(T<I!=+aOzQN?JS<R@l-H9F`o#~S^ndoz%+;}rJoc_rpj4q>_k;sh~sNw8R
z<C&3{#`{JE1v9qj<|;A5MFI_%Y>yeTa=p=Ot!ktp4M$Q`ZpaJ14Vob8MM4sGAf6Rs
z_>P2w<mT5Rx3~q!z7dW=@zR&-`Fb7nn8$@xUP`$kqV%Cbt!*^OGo7iPF&#N8F%Z(K
zazj*q3-qEf9}dEXppnUb@>UfC9gV4jHvl_f{o8udq_q%nJ00NC(M-suy^?(PyNpy~
zhw+5I05EayS~9reJMzbYVdD0BDOj{oN8G(!PF|^)CBky@z~rS9`1^-V1kX|aF7ayc
zIG7(M0sY}a`nsN91<!Oj;KBV8aJBP}u+S8&ok@BPc-pK0OWxx`yk)(<(4-M=nqLRl
z#orXHt)}#T^%ZPSDzIjsxQy!YmKyzY%W>VF&L-Vz=ZAW$*j$%xwh{Q%JL;@ntONw?
zji69&(sWJlt>;@G(#;C~{}g03?HAh)z0>_9?Js)b@c=WEJR>UO4Tz>6`b73~Cb5gk
zBBo=S%P3Bn8L}gbNgMURN&+=BVoIlZOHm^DR1em!ai%|ut;GHr{1f}leh&4Lc4Oyv
zd5g-k!;Nv}uZ?5dldzsQ@(e2VWD&hOkcLie*o{K*3&w9tW6)OzKS0MX-Y|Y~q{Qel
z^#{5wmWPx^4^r**MQBdjM`YHQ9B7v(ik@roK`$RordHGu=nq?$k+gFe6wdWUl#>aN
zi(e(RQXER1PAWvM-sq-0uHe*zeOk!ec7Y1g*HCvQH9(8J(hfFTqN(1xzu|(fwje5>
zWrLeU4Wqe9@U^8@GCOq+;>1+L=N~X+_?8y(=Vc9)TsTi+_k0W=7pcJm??sU$-%JL{
z>Ok>$6Bz7WMs_&+;T>cMv=BN;s4n&4vx{!fp&b@HGe|~=l{m=$H*k8PnyBsd2jw%#
zw}Jcf(S$a=QD1Vs0XVVAmDufg4`&ep&ORmag1~m1N2-KuQQtg;;_Sjg%P&ubi77I@
z|C2R<bb3z6Qo|qS>=7O-?Gmyy2v{#jd{fKPqv>K-*N$!P{BL;%JfmZY>S7g<Da&TP
b#*@z;uu^EP>st%f&@I5p#>ThCmGkMp^3DID

literal 629
zcmd<;VBu)^&LqI3^q-mQ53`+p&#ssd?%hYrzVDo}V84}$$5N}k=4@8~>Se6v1aRy+
zCh5Fe{EGSRJkcYTd##RJ%`i2z41YVzYRyq~>%)x#yDv#G?|E9+zB}(vr}cXF$=1R%
zcUlR&?zNt~lifPRGIx)6#i2dT`@Zb%t@X5NUTS3%aM;{B*+prWg}3LPX5ou_luVfR
zWSoC$^Y$Z?txT+{%|&)^n+cxBY^GZj?QS~8vv(HP$6cD!-E6-$s@N`HJJIIg5qaB(
zGcVZW+RWH{S@-weo#Hb<cG!9@nr<ti*0cNkuC~4R{~GQS-d4Zwz{|ONPj$!GP1qk|
zm)h65cW&ynz45#Ows&h5?^}On`F{TDd<PH>;)BFN@*s5}^&ov9{UCEd=7G!wnGdoD
zWFN?0ko_QcfZPLe7s!1ecY@ptayQ8RAb)`T1M(Nhe;|K?{0s6o$p4^l0EGuATtMLi
z4kuuEfx-<GexPs!g(oOnLE#GuXHa;9!W|U;pm+eq2Pj@Z@dJt{P<(;n4HSQ%cm%~K
zC|*JF3yNn@e1qa$NR^l2^JWJjIW8Fnh6a0FSW1BlsG`cE(RSsxleQ+_N_Op8O?De|
sFWP<lstVSn#KOTOz^KK;!6?eWaKcG;*36l92B}t@91K8ygS`YR0Fn<9$^ZZW

diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 40dd10b6c3f76ca080051bea4635c9bdaf47c177..a6dfdce95be4a6a3edb6a3900b3d17ffffc6d075 100644
GIT binary patch
delta 66
zcmZ3&mut#p!o|hW@SRD3QG!u{QHY6yK?;bKfLM!(gV6{`TLEzp5Jv%V5)c<LaZG;0
LX2QZ?v4IHyBF_lp

literal 1828
zcmeHIO=uHQ5T03*__}84x^&y^*3~5t+y(<-m+BHp-fp5&tA#dr2*pFmA%}tpif!pB
zAf6NiZ}B8}^&oigS_C171VlkEf_U}hP3Xy)O@vZClm>b#%gp=vX5QPGdEa~LB~=xj
z--?bFx@af@Y?2&FK@sSu1h`nHQG;ZSq(yR{#Q2s`Pl-L$g{2r70VP;RdrO@YnmO}s
zHFO63Tb2Ah<59T?0MWwp`R+|4OJEQL(&3RkC$gsc_0<)J4CDdRT$aFgyFE1Z_HY5f
zjl$Uo7I6jF;V${?Q@QVo2GEfvsfgCwm3ba|Si)t1ovSBmyd11R;oLC6KXz_Qhn0&S
z)jWi2oajaH6THp^sBuB-Q~)<Fvf|Rk<!SQo)d-)i6aF$L9KgdG9WWi1&I+HP-VK7>
zI6wIL<$Cc&w_7b?h!Hl@+UA+v_iLX}q>PK|q{fgr==ZA*_l!wx{?4-sPgIf#-aq04
zP_^0m{NpE*z^C%BH5;1jdB8deDIKOGu{6ukR_T}Am{$80yS|sDpMfScEP+N!ppJH;
zc^^q}c4QM;Q|y+ULP>5tPC`d+Oi_rsg~`BkN)r{Hefavrh0EL6QUxV(_-#;M2Mb*A
z!2Wy`dYvYEJvbb__L-j0Ydm%=k9)-sy=I0d=O20<2d_RJo>z3S2Ep5-^C}7RKfF37
iR^@zR7(aAsA(K3Mia%=0qqa6`>6w8h(qo6=8|4o+d2&|(

diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
index 2cf36927295619c25ba7c2eb3f2849016cb59809..58ac211ef23a43679b4d41b8573b4cfdb27d2ea5 100644
GIT binary patch
delta 73
zcmZ3&ca?F1C947#lLXV`dS(foA|?(7DJKwDN=S&EgIm<txY%9^#)#q(;*w=xIAE`8
RY`obHq=6ZzVe%U`3jpsp4rKrU

literal 1828
zcmeHIO=uHQ5T03*_*}DeyL8*_*3~5tx(x=xF4ZNHyxl~lRtq(F2&IRTLk@)^wD?0$
z0r8|Dc#9{&t2Yl`iy-8XfGFri5U-xR2|YQpiBPJC(m+pTnR!3o%zHaC?|V<Ztg52(
zThY-%7Y#*#O_C!iC<6VIpxH8w8YF8ZEs|{#<6A~OBlb}jmSSWClwbqxhw7Zr%$aw0
zLTAvwUCG}w9+!&%5G}q~=-x821O`DM9Uj?pB5SH&Ute{|Kpry9WeIGz+e1@t9~S}K
zD4dO830H9gw#esz%6(TffQ~dtMYP_Y%=6I060QL3UOQFe<zN*G7lsM`v3plKtX%Y{
z<{@0?L@$A#;B_uQjSE_*0=RLJ6_+k9Pm_PIM)-7{@K-V603Oy-0(4kDFMNV}Hwkj%
z{NU%88^xF1ZncCVM%YMe4<`5CuYE$1GA^kT8bjuw->*8{GbXf!_2(6ys3a4-f5Zo%
zYP0plCr>4T&*WcgHZ<AukaZGLI!s4md6uKC(l5C&t@bN+eJ@Kt15IdH0u5q?j&`DX
zA4zd`WD{Cb?3SEDNp3w(LPu^+QHZ*Q$-r|;XDd8=|ILT_E03_H3QFSe+oZk@7P#Pn
z{rNcbI!E-{IU2nVn4Z#WJa(*%d&LmFW`-x{A9|exuRb1~S9Gxk!Q12WDhcyHygDIP
h<$PioKXhs#lRSEgKWfXPwl-?%nSmzKV~1fM{{TI+a&rIx

diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb
index 7a9e57d42b9abf5fba51220ffc64d524f6f3896d..fb82a78c8d248c0593effe321a0b7e5049e23e35 100644
GIT binary patch
delta 25
gcmaFCUdhDeFp)`<nTdm8qJhZdjm*X@3>NE{08U&5xc~qF

literal 1000
zcmd5*L2DCH5T02>`gml`cAKq9+SMhpxC8?sA#@4Z?q*wSS`?PhL+Ggn$)V7TsFa*?
z(Ubmw^dxwd{sKi2gdEbVRWItbo<+#Xncaw<yy{`*?YwX1y>I7zBSR_0=!c>~9xc=r
z0Y$RXMS%vu$TtC=v>hxf0&6J&7B&g(lI@Z8$?lQq=V`ehW~hn0qNfE^oqa4G$rVvB
zUc9@uW}Z%OdG@Qd$BhaA1dS;BeOu26)u`9&zR6K>MdS>5cC|&<fp4Eqr{3?>QbuHq
z!C;W2Ix}n#vA~^S03D2Q9}cPL4_ErEs7#&t2Xx>Y-{#Q4D&7VdZvJO(5)z?*>Z~>~
z_`4hVlrnb_mM^PugHLYWd2N0j?)nyTcU`!_+a0LI_{J{*S?%OS`B@w6n#)u_2?<}`
zpa*)^rUwFWFeHU(xU(v11WmRH;?nc?Tb1MSc%3f50J|CW;o_&a@!5H~_W?ypzb><C
z^z@R)67o!W_PnKM)tC2|T8XB3!#o~;^zBFA7X2b;vz!uo^K7PNkWSa*a>^e2Hp|lj
zCtXdu*+AR5qB3qku)0Oez64g}EL6dT06SWAw+G$4Ks_Z;!(!}X)m6A7J?Q6>j&VfA
z!_62x$kG26@~Jp*3e}Xy_yeAqBkW5-hr85O7Y^u~1{8=5lxo~08dh0O$Af#JHeZ{`
Ris5{v>3|;6kfM8{`~=cb)kXjS

diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
index 38141ba7e0f88017ebecdd726b1dca68f003c65b..71038798ce074a7886d2ca9574779f193a5a4475 100644
GIT binary patch
delta 25
gcmdnTSINZXFp)`<nTdm8qJhX{c6MVH28)eM07bk6^8f$<

literal 1854
zcmeHIO=uHA6n<|_({bF`?b5W{t*c8QxD5uvF2yC1%x<DmtA!dogyNy(kV8QP#UFYK
zh$jnzw|Ek~dJzv^MG$gGKs+e)BI3=HH=!rr+f*pEhtfb#WqEIQ=6mz=e!dx5lTvj4
zXa-v7qNxe6NphzJW&t|N0oaT^ENBA#lmHjYgf>W4Nm?ZLNX(yUIWD%*5SC`91(aY7
z?MHG>WU@2wZ-&mGf1{GWYd$F#0U%m<G2gvz>I4Qspd9Ymb3)I`Z?7-WcA)l{=5zwv
z?e@^r+r|X|HwtGXSi}`vgF7^5m&$$DGJJAAenjhiP<ifpSi)t1jmyVsv>2>F;p{NL
zKQ?YDhn0&S<vfHd9Oy;x6THp|sBuE;lmIs_vf|Xm<!PGVs}Vk3C;U}RIDm&WDlh|<
z&Iq5N-Zg^UI6wIH^=k2Dw_7b?h!HmQ%)`m8kG!_B<mwj`Df5Dy$go9r(C=3r{xc^s
z^S7T@c%YID@G&B;gR0He=bk=O1a7K-)@+#NnR~1g&&I;BNG#2=(^cBojcK*tvFm#}
zoe7%IumqYZfd<-%=6w{o+fhwuP4Tp(7@12wjzveUPm!mFg-OSAN+&Bk`ryr{^A{gu
zOA3nR@LQ*U11xaC1AFT*EIUOkyMHj2?J_-P*=QtL9`&Xnmdy++=RcMmA-z5yoL+Rz
v2En_-(<||IA9@`TxpF=cjh{eSNGH$X34f<84_mFa)6$~@O{Av}!?)UB4up1=

diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
index 6ee72a18306f015332a82bf3b075a6a79e6e2154..d747bc2e346f4a4613ce853f783f1102c731e996 100644
GIT binary patch
delta 138
zcmdnT_nvWrYrQ%blLV6xv%vwTBpwb13kC~DAZBo2%;Mr;5MYpCP+-ttC}QGZkn)5p
yloAqR=inAKHZHbTf-$0agt%lG7!KI08XIr6!*7(55zuHx2}T7jEw;(R?Aie5b`!M#

literal 1854
zcmeHIO=uHQ5T04n_*{4Gx^&y^*3~5t+y(<-m*Nsh-tI=FRtq(F2*pFmA%}tpia+!e
z5Kk5aZ}B8}_2$8=2tp1ChzEsUM7(+OCiLXYrb4M6N&`KWW#;XB-@KohdEXl~RaMdb
ztr%#dho&OHAt{^^XaRJk3$U5^SW*NAIYAaxLYpM3ByEy=B<7F2dR%OyA#BCW3#h;v
zI*-&jp<6TWZbt5KaHCedYd)!#0U%y@G2gpxY6OO1C|&M3b3(J!udgrBb|Ckd7Bm7o
zozBSA-^K+1FOFtoSi}`vgF7^5mnwWybUryBKc@BG%OZDutl%=h#^ob5UJO>CbaoWr
z?;E$I%gRHaavs4I4)h`f8Q$Ooq@2(OCBRF{tT=T^b(-e)Q^KbkguhA%2k<e?2{2&k
zj0gzoUn9s%io>5@u9jc+di4rM7-Lh@AD-U&z-voeUHyzAXI@Yzb+)jEgF)TpKXX!_
zzx}+%1GQ{`j}h}ds5@+Z?&&j0;HLa*&4w1w++&@2HW5w4VriD0uG7X|LaY5syujD!
zOwfX+Ezl%#80ci0_mSjoSGJ%%#nZCO$Xx1kEV^=iiaa%J%sReXIZ@-$2X8)}zxWv2
zs-ReozIFOHzy=R|aJCM@vXjKJ`}<?rF4H5HjYpE@abFr@+05wX{KK+Cq}QkY(~F+j
uFnoJ(dS%}JhhB$7u0lXW;}WQr@>w}N7VNauQLCgoEfpPTA(cLihWG~+%yzN>

diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb
index 3cdf9144c188be34073ee2f4a6694c9df70ef366..935194537efd4eb03e7587e52d9c7d107750cab7 100644
GIT binary patch
delta 62
zcmca5R;kD3z{SPU@SRD3L4r|%QHY6yK?;bK_&69v85kPuWz*8OIcP9yF>x>&0mUa8
Ph)mwdY|O%7v55%)P74ag

literal 2906
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
Ux%c2BOm`=iI{mFSmF+S73)koN1^@s6

diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb
index f02b8a20075c735e6d512e5a2c18394a7f44db3b..58dc380accdae20e19a4331054cd2882789f2984 100644
GIT binary patch
delta 370
zcmca5wt#(tG$#W?gS~88+BS!YDvFYe*tpm^elZGgNH7VpaWEKYBrr-<a7lBBOpHrV
zU<hDLV8~?v0tBISfk_o)f(C;D<77rgwTb^VU`TngI-}#{Mn-4D07flcUXUu$vuDoi
zlLZoX3Je;I1`HMqt{{#FLny<)|8B7$A{9hT4q;L>VbWl9V&PyAU<~5nEfc(TNEBp(
z1Xt7^Mj;(8eqPO(ep`@vwz6E;7uyK&^ExFwwVr&JNxy#9Oi6pNAjl?rRbyjgd!Th}
z25c5Q4*Xv7y#0qtZABRzWZYyK7#=t%1OTOgE^%P=5C}+#V2EHy5`j1t95M_HRW4v3
zW{CjZqAS4&@vg1`qb*3jbj?w9^9sf!9uA-p7K}j5An3rD#RXK$Ai)5%mZ6A=WAX-O
JQ)Y{Ei~ytoTqXbj

literal 2906
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
S{f{u+9a!qrH`-M8Xa3*gOZFlF

diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb
index 0ee7764832ffa1a8700b252832bd2f355819506a..02348b94bf1c50a472dacefa0cc0cda049873f6a 100644
GIT binary patch
delta 25
gcmX>uTgk-bFp)`<nTdm8qJhX{Id)?f28*>!07$h39smFU

literal 3783
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

diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index 182628fd61b5f124a6017ae59674004208e9d305..a844b03e264144585e6a8efeab1921214665a6f0 100644
GIT binary patch
literal 3836
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

literal 3783
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

diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
index 3578e0eabf1766210752c3720982102fa2b17db4..679aa66f622bc94e8616e0feec5d70753aa998e0 100644
GIT binary patch
delta 66
zcmZ3&mut#p!o|hW@SRD3QG!u{QHY6yK?;bKfLM!(gV6{`TLEzp5Jv%V5)c<LaZG;0
LX2QZ?v7QM4BFzZm

literal 1828
zcmeHIO=uHQ5T03*_*}DeUApad>*^8+Zi9hkm+BHp-fp5&tA#dr2*pFmA%}tpia+!e
z5Kjt%w|Ek~3LZRoErO6k0-~T7LA-kMCiLXYCPJwmN&`KWW#;{SGw<!pyzf2rysC=s
zZ$(E7T{IK{Hc5e`qzDW$0$i-ns7bO;(k8h>VtmV~$HWfm!cvT!0N>j{`++(yG;{Xd
zTI37|*Q>?b#-mCZ0OG~x3%zSbp1?2+rNbk8UgS;n>#K_n8OS}Rg*<_sPG@B5?cgGS
z8%J|7Ea56{z%BCGr3&8_4WKJcQZcQ!EsH$#(8m>ktxHF0vK*{J>GUYUKeld2hn0&S
z_z=NmPV^E4Dc;}$)VZJyDuA1mS#jx-$_)AU>x9oV2!ELn4&Y&(4ww$hr$j(d|0+Rl
zQXKyLa;5yD*Q@y$VT{eJcK_t|`}I#KGR8S|N@K_z4hA)cd&ZQuaPwJ}C#vZL?;rC4
zsM&0N=J69r;8Xe6nhj0%++&@Fl#Q~nSf1l(YxGNQLaY5s+`!Az&p->BmOvvTP)9q}
zypN<fyRrrCX?9Cbp(M9HC!s4hrzu3;!gSy{{_!f$-h2Jw?1hKeRs|(-^legK2Mb*A
z!2Wy?dYvG8-Q6F(c9|a0Ych7MOnSu-y=F%z=O20<2CqKupI3CThT+?T^C}JVKfF35
iRuuwb7(aAsDVIKaN-%CK<F-C->6w8R(qo6w8|4qw9&)At

diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
index 791ff9e40ea117a166094b2fc0f16747aeefcd5e..fec3962d776c92b99fa7970a685a42590d1dbfcf 100644
GIT binary patch
delta 235
zcmZ3&_mE?PrRW7_E_RMzi~<}IOhRlN3<eqrj8YjB{W4^fBzPGZ8tg@Zgo7*t!vT9$
z5LbgSfI&-lvL=%pe<;Jh|8B7$A{9hTp3kZ%%%s8S#KOTKz!1dBTPAqmP}CmA$?KWY
z8RaMEvx##!FnaI@Fhnp+UclzdUc|(~AT@_&qP6klv&<1zQrK-X0NE!8k$YGbVlN9K
v6c{xa3>YjJT+g04W9Kn>9&0M&jmc}6v?lAZIY6vp1zR;)mpN<lTQ+k5g7G_y

literal 1828
zcmeHIO=uHQ5T03*_*}DeUApad>*^8+Zi9hkm+BHp-fp5&tA#dr2*pFmA%}tpia+!e
z5Kjt%w|Ek~dh_752tvRFL_sftc=hB>=*gK)gi<|}26`&X%=`If-rJdZ-+StLRTbUe
zijEe#Xea_~k^)Id5g23y%~ojCBv~hEliVROzU9<oVh43$DMn6!?`@#{K%EzwIs0}k
za)yKJ)#7dAQKbw3@#6D^-ZdjnU>Jtd;gLNr@}~Or)kTL4<Q~&Pp1@A0Gcxsda1p?b
zqq!KCa1}S;7WwQ_h3|?6(3K{snAY2tMIL(S;|jpmr6V<24pyObdX(TFTQ{V`%0&-+
zh~P3OdI^FQZ*T$XT+jv;z)i}mxO7QnhWz_=!e<(Uzf1@R@UWf{pu_Sh5fIeBN|2ir
zhd;kuDZl9TYCc97V>7GWKe_#G{S%6eaZa7m7&3>0LCxWwF{Lfsd{*U&YC6ID$9w>4
zHd~*0{6rG?RQ|PQLz6xCSf?Rnqiige=Q!FL{gRu|YQGXU@bdIC(1NBV&>&XmXs4R@
zkrZcFwxB)DZs{qM<ksgTbmitWg{WJY4m`&{Ugg<)uiu}&@DSUopd^mIP3r4lfeRkk
zpASN>6GX4O`=i$`(<6FK#*URquNb1&?C9kDL$AZ&)yMtwiZ0eLd~<MKrD6VuSBJ!^
hLO=}ThfXc!(nn7T#%*QX*2gV9GtfeM>@fO(e*oK9a>4)r


From 6823fc5d999f062a2584a68f94839d1828b2fad2 Mon Sep 17 00:00:00 2001
From: James Huang <jamesshhuang@google.com>
Date: Tue, 20 Aug 2024 12:52:28 +0800
Subject: [PATCH 06/11] gps: Update release 4.15.3_3_240815_R1 config

Enable GAL for E911 location for ATT by Set CP_LocTech_Constraints to 5

Bug: 316151601
Test: CTS/VTS, validation test/stress test
Change-Id: I0f75458a7e46dd72186d9423153c8c740b5987f8
---
 location/user/gps.cfg      | 3 +++
 location/userdebug/gps.cfg | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 02a8a82..63f8273 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 9a6e6c6..b5485f0 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0

From 6ed43e48650ed965acabeeddba9b904f5d09d272 Mon Sep 17 00:00:00 2001
From: Neo Yu <neoyu@google.com>
Date: Mon, 2 Sep 2024 18:05:52 +0800
Subject: [PATCH 07/11] Include gril_hidl.mk for comet

Bug: 283064367
Test: verify with test ROMs
Flag: EXEMPT HAL interface change
Change-Id: Ic0f7d43743d91a49163691a55a6f56c0215ad8a9
---
 device-comet.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device-comet.mk b/device-comet.mk
index 6e9e04e..c3bdede 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -67,6 +67,7 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
 include device/google/gs-common/display/dump_second_display.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_COMET

From ce8f714448bca06dd59be648015496f5845236f7 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 6 Sep 2024 07:26:23 +0000
Subject: [PATCH 08/11] Symlink current prebuilt folder to android root

The Android are now based on Trunk Stable world and Pixel prebuilts CLs
also needs to reply with this which controlled by the flag which results:
- the flag value might be different on each branches
- the flag value are mostly different on each release configuration
- for local builds, ENGs' needs to figure out the correct location
  of current prebuilts by checking through entire prebuilt textproto
  files

To alleviate this problem, create an symlink file under android root
indicates current prebuilt path after invoke the android lunch cmd.

Bug: 364831620
Flag: EXEMPT export current prebuilt path
Change-Id: Ia9e3ddb4b86e2945e91ecc2ff5a3fcfed1bde177
Signed-off-by: Robin Peng <robinpeng@google.com>
---
 comet/BoardConfig.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index c79c97e..5a65e1b 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -30,6 +30,7 @@ USES_IDISPLAY_INTF_SEC := true
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/comet/proprietary/BoardConfigVendor.mk
 include device/google/comet-sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk

From 8a51edfaac87a074141881fef6cfae34ec3da4df Mon Sep 17 00:00:00 2001
From: Koli Lin <kolilin@google.com>
Date: Thu, 5 Sep 2024 08:17:27 +0000
Subject: [PATCH 09/11] Update Comet product ID

Test: manual
Bug: 316248308
Flag: EXEMPT prop value only update
Change-Id: Ie30ca693662b2de26032a0bdd516a86e867f048b
---
 device-comet.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index 6e9e04e..8c57c39 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -529,8 +529,9 @@ PRODUCT_PACKAGES += \
     concurrent_foldable_dual_front_xml
 
 # Bluetooth device id
+# Comet: 0x4113
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20499
+    bluetooth.device_id.product_id=16659
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES +=\

From 0e0b8676dc937c4d6df996019fc65338069740e9 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Fri, 6 Sep 2024 09:07:25 +0000
Subject: [PATCH 10/11] Set big core to group_cfs_skip_mask for sys group by
 default

Let sys group tasks will run less in big core by default.

Bug: 328210236
Test: build pass
Flag: NONE powerhint change does not support flags
Change-Id: I9f71dc336792ad0b1add06a83d6261273313f9ef
---
 powerhint-comet.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 2fcc7f4..44653f9 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -297,7 +297,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -1413,12 +1412,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "PerTaskMaxIowaitBoost",

From 293b436df4fc1fe56d032c120b57a0a15b511e21 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Fri, 6 Sep 2024 09:08:33 +0000
Subject: [PATCH 11/11] Enable auto prefer idle

Also disable prefer idle for TA and FG by default.

Bug: 236868627
Flag: NONE powerhint change does not support flags
Test: build pass
Change-Id: I43f57177a7bd8dafc902063fd63d3bbb58ffff71
---
 powerhint-comet.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 44653f9..13c68ae 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {