From 81e01f24826d92bf82f8b116995f233df00b34d4 Mon Sep 17 00:00:00 2001
From: Nattharat Jariyanuntanaet <nattharatj@google.com>
Date: Thu, 12 Sep 2024 19:24:21 +0000
Subject: [PATCH 1/3] Enable STResetTool on P24

Bug: 361050657
Test: manual
Flag: NONE add property
Change-Id: I069078ee94af3dc3d077d5f24a458a295e05a259
---
 conf/init.comet.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index c9c59ab..a6b567f 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -7,6 +7,7 @@ on init && property:ro.vendor.factory=1
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24
+    setprop persist.vendor.nfc.streset libstreset24
 # No se_chip_en for P1.0
 on late-init && property:ro.boot.hardware.revision=PROTO1.0
     setprop persist.vendor.se.reset.chip_en false

From 08843593774bcb285127bd041acc29aed5d6b115 Mon Sep 17 00:00:00 2001
From: Cyan Hsieh <cyanhsieh@google.com>
Date: Tue, 25 Jun 2024 07:59:24 +0000
Subject: [PATCH 2/3] Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by
 device"

b43f7a6c72c592bb9761df991f814a17737e8ad2

Bug: 312876454
Change-Id: Id1accfa1a0aa9bef0a6777c944467f6db3081287
---
 device-comet.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device-comet.mk b/device-comet.mk
index 062fc28..0e5430e 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
 endif

From 990359fce1011d92e9eec8d8e7888415be60d120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Fri, 13 Sep 2024 15:09:35 +0000
Subject: [PATCH 3/3] comet: Update APMg3 tuning files

note: version 240913

Bug: 295551854
Test: Manually tested by sideloading into comet ZP1A build.
Flag: EXEMPT voip feature
Change-Id: I77eb2dbbf444285cf9a714936b6bf7d93ab56f30
---
 .../tuning/apmg3/downlink_dock_config.pb      | Bin 74 -> 74 bytes
 .../tuning/apmg3/downlink_speaker_config.pb   | Bin 1143 -> 1143 bytes
 .../apmg3/uplink_dock_aec_off_config.pb       | Bin 121 -> 121 bytes
 .../tuning/apmg3/uplink_dock_aec_on_config.pb | Bin 1000 -> 239 bytes
 .../apmg3/uplink_speaker_aec_on_config.pb     | Bin 3836 -> 3836 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/comet/tuning/apmg3/downlink_dock_config.pb b/audio/comet/tuning/apmg3/downlink_dock_config.pb
index 2fdd177a4bc82233ef0c8641a6c94ad8e68049ad..854a48d381e06bfb96f2e760552d6a7b26d7aa95 100644
GIT binary patch
delta 29
jcmebBnqVZsD9XTa!bx`4%$aruX;z#Z3_yN^y#ylwZM+7A

delta 29
ecmebBnqVZsAj$v)vLM1B&5Dx)#BZ>dU<3d-`2%kN

diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index 522c72120b80e99b3673076e822117b099476afd..f8cee4206048ab20a53d98a9db96ef9da3f5af27 100644
GIT binary patch
delta 58
zcmey)@ttFX5DVJ`2O&8wnaK()B9jeRSb&&ITCSbZ_Fkcv?a{T1Y_IHOvXgilXm>Aa
NncZn$hRLBUN&pFm6CeNp

delta 58
zcmey)@ttFX5DS}vgOD7T%wz=?k;w)uEI`a9U1iZ|yYkyfTN7_3yY{RmyN$UQ?LK~0
NwP#>xm>kNY1OWS@60HCL

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 fb82a78c8d248c0593effe321a0b7e5049e23e35..06e4ef570f52ddcdaf4aaf6608b76c97bc4c56f4 100644
GIT binary patch
delta 39
rcmb=d<l=JR;^Jud&LqG%kt<S+$%zfjVe()MV2EH$V&Y)1SjPkathNXm

delta 39
rcmb=d<l=JR;^Jud&LqGvkt<S+(TNSrVf0`OV2EH$V&Y)1SjPkatak_(

diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb
index a6bb5a41c8d01b7a021730daea59c0fc75b44e01..979a200ce2cf8de814a1452b1c10cc069bf48562 100644
GIT binary patch
literal 239
zcmd;b;^N|H_|7E2D8Z<}D8$6UAO*xqd>o9T3=9qSvJ4D8jv9<wOdO0xEF3@;RzTSx
zAdUj!Bp@yVVj*=dCJ81XW`hGvNjw}377P}QK+NF4n8n4xAiyBOpunI3Rw(5OS12VU
z#LmGjYHVC=uLNU6@d$ANEj(baYHYmO4!==KMnI!MZsyWr1G}Hu2ufQ)XeK8p?ZFtp
N5Wxs^E2G6JMgUcTAY1?d

literal 1000
zcmd5*&ubG=5T1!)`*>u{cAKrqwyR4dxC8^shR`J>-A!6+S`?PhL+Ggn$)V7TsFa*?
z(UblG=}GV^{soF62tm@TRWItbo<+#Xncaw<yy{`*?YwVh-na8ZwxtxKA1Mv;XrrDI
zV3HKi3p4;mfd%lW<zP7_&`S&Qs1w>H*(2$b+#%7=6uBT~sEK?^R|L4uKAJ~zMHGx@
zZ?CLbC(|3v(#y4nwF&@)wJ7_2Th9p9s8*|i#g@4ua)vy;+@R+mD4k5F&EKxYjK~;+
z!60#UW>_O)p+CbAIvC+T98%C9s`xpjGIi!3Qo`3kiA@Jxya_Pe{Lj>+O@#ibvRlO9
z?`jl~%UnfRzNp3pet!MdE9>iUH?Wbb>%%p^?tmBL8@~p~ZY3S%w$@nHmnnYICVY8=
z8uX+^4FYhmofe?s&Z_VTnrsuqp=a;6D#zpTIz50Pb~Ebz#ZPbI+<Ce80YzHBDzj?z
z_(GFMsA<X5rwu);zPP*8NM?#JtmE;=p!DF|Vqmg2k5fW#?#;9en$z_-oV>?DiO16h
zM{yND8)`e3RK^VmSGS1Sm(Y%!1s8k>v7<$|d(h1b)M-aFG-Dl4U4<*sgMKcl7+VxP
z+>F749Q|)0pN<Wu;HI05-{YM*!oC!g+^4Gga6sR*pg?S(=y8!~S!G#?7x$buKkLbf
Q?fFUD0X?K8MgJZC1lB{<VgLXD

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 a844b03e264144585e6a8efeab1921214665a6f0..64b3d853d5d336087fb6e8b4bf4c1ab90b6839b1 100644
GIT binary patch
delta 102
zcmV-s0Ga>%9sC`z9|9NvH~>Y>%*;MW0962BYDQfEz}iJ+06?6RO$9-dcmgE@W@aXn
zpaLr+W@ctTAOI)>Fa<adKoCkF4JllYJrw{z97Y`g0N_9%P$&qK?gA+R4wEhhKmvM1
Ivswe93phm_SO5S3

delta 53
zcmew(`$u+zJkw-T*2u{fOsdS9G5(VmFlmdNJ>z4qz@Wiwz-+<qAmAm>s~OWj`73Mn
J<|yVx+yKVE5HA1#