From c8ff4c6f3cc995d7067ac180b1ccf3108046b4f5 Mon Sep 17 00:00:00 2001
From: Pat Tjin <pattjin@google.com>
Date: Tue, 18 Jul 2023 20:57:41 -0700
Subject: [PATCH 1/2] tangorpro: Add userdebug init.rc

Bug: 290944591
Signed-off-by: Pat Tjin <pattjin@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21b2cb42a560e18e8345adec3a0ff5d99d2ebb8a)
Merged-In: I582d74bf2d753a86a9b329ef52982cb99056f375
Change-Id: I582d74bf2d753a86a9b329ef52982cb99056f375
---
 conf/init.tangorpro.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index afcbf90..95f92ef 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -1,6 +1,9 @@
 # Tangorpro specific init.rc
 import /vendor/etc/init/hw/init.gs201.rc
 
+on init && property:ro.build.flavor=tangorpro-userdebug
+    import /vendor/etc/init/hw/init.tangorpro.userdebug.rc
+
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
 

From c75ff876a64cbe70ea1013041b400fb082fac9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Thu, 12 Oct 2023 06:41:55 +0000
Subject: [PATCH 2/2] Extend the APMg3 tunings to also handling turning AEC off

This CL extends APMg3 tunings for the tablet, dock and headset usecases with counterparts where the AEC is off.

Bug: 301568974
Test: Running CTS test suite verification. Manual testing in calls on Tangor.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45e117b89052482423345f4b64bd37a4d3e5ce06)
Merged-In: I87fd24ba084691c238f5c07272208049acaf2e5d
Change-Id: I87fd24ba084691c238f5c07272208049acaf2e5d
---
 audio/tangorpro/audio-tables.mk                  |   3 +++
 .../tuning/apmg3/uplink_dock_aec_off_config.pb   | Bin 0 -> 2078 bytes
 .../apmg3/uplink_headset_aec_off_config.pb       | Bin 0 -> 2069 bytes
 .../apmg3/uplink_tablet_stereo_aec_off_config.pb | Bin 0 -> 2833 bytes
 4 files changed, 3 insertions(+)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb

diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index da4490b..b7e383a 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -65,6 +65,9 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_aec_off_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_headset_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_dock_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_tablet_stereo_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..bd8b7201345389eaefd40eb5f0ba4c1c1e7155a1
GIT binary patch
literal 2078
zcmds&O=uHQ5XWcI#J+B`G~H%xns)0W5=@JMkPy1mCi^!1u+|o8@lc9FEm))=Lj5W|
z1w=0jinkO&LA;3<54|XsqEMs-1yS^*2QQv_5uq2I*(9_TR20GDVQ1gR|Gk}=o!@)f
zJ=8Q&{Nf8?1SJ|i0nu6kCP2}NH3{T~vTi*ss#rik=qq;m1f~TwAp#P+EdfT0zz{?m
zbzVby<wh{xy!g_VFc$WNHL@;&1;Mh&fW(PTS`;8TK(tjr7GO!`0M^}p8gY-)4(cSp
z;Bt(dnWATw9^-bcRx36zBqBbePxwOqNI=R2rXZKeWSo9BBWtU}`7yr;gu>%6iKk$;
zo<5Hjs5biQ{FV+B5u<Zjt7tdR7?--Owbj*J{BhTnY?3@s+0lm2hm4@mP2Sbw9{CwI
zY5SbTL-B=DDZeR=1x3)Do}MmC6B|eoO)7f>6%67iPQqypb<@N?`t(Y!D7O^76Xz}k
zgElH00hsUGVP>U34*gRjUGm`Prs$BQVn%TsJDYVc%?}Qqcw&8+Kk7)}g0UeT<B49b
zZHMwN-8dIOl1-M44GOx$q**DDW_K@X?zr@i01AGtsG&BIriqn9mBpW44<xxH%KvXH
zpkHWww><F*h2Pk(HRzAdHT9U<o4q|$XTy1;LFbw?-zRTy;SJ}lh0<HD0C1wL=0Yla
zR#9&sDA&tEsfDBQrG#Clw4qkL<Jk2ayHucgrDS_TaG(kY!($PFhM(BOsAs)eOLFMr
zFvUT7(0YlO@AD>SnA#qKnCB8bshS)&&fkBwuWJsb2qXFsF#a&3k<x1=AiA)PQ1A%l
zgiri2p%;lz-E3YwVsoN$an2igPK4g<C><t3>xs~_j>SD9G)PIldw>!E&UaEGbc?i1
zs8n{#{{!fbJ28Ic&{ja1%}qdY8=zd!&`YH#UHbLX&9eCmfG#ahyr=@o?9%DJ$|#l?
zP>&`)3A_RFfR5-)=3(9gbkF6h4yms>RW%DuURhOxVs!En6Oann0VRgKlPFKzNSAh7
zcV#*eq|*X^1I`srLecTy3{~N@QgyjaIPr&Y#?pLl(G9P4?(%N?nsnveU4CPs@}?UL
L#*waFw4dWQ8rY?a

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..03f757496217664b6e857e43cb326c3c81e1f346
GIT binary patch
literal 2069
zcmeHIL1+^}6#YNVn&~#7>6(~y+r?!exD5tELUD;CJDaqnRtq(FC_%9V3{nuGqC!p!
z;z>d9WIPqbn>P==hJq3>5xnTxgBMS|iM{Cmn-)S(f(I@1Fn|8ce}CrxKl5hP*Qlz(
z{}GB~8cozf0`!Q0B!KT)rv;L-Esgg-Z%RuM5dVeQkidc<71Cg0$q=ATi%=Z&sTlhZ
zUV3TFq;@_zCe#xFaLgRHu_^?T(~^meEIBCz2he8(%mZ{~8DP&_q#5r9tsrj!Ebm$r
zOq1FcHSI-2jfj1Wi*!g^5K26pR!p!l-zXQ0MR$?K>Y#t6QV)|cu?`z}8@48Bdo)1K
z(yr~10r-geLv=>PlBu1mjzNy)%w6qKDMt~=`R8+;%UYC-ysE(?iZhy2zr4C=5WqbG
zwW4HfwOT`{y^oZUDV=Ev%eaOcaEE+Gg!L_SSSnxAdR;fem7`qHL5ZsX?S&KZcQsgp
zb<C!QW&YZ}<{B(av>^`;6f8E>=&JfvKF=D}-}G`U_~bkXB$N__=~W4Hrbd`;k1zn$
zFyH5uSy3QE?-ChIFEjZ5c`5g@)2R&4udc)%Om%k~A5nz0^Xg=bP02yOUolwICS!Bg
zpOtx{987Qol5apoXY|>}Ph2uSbq~=DOtR+@bdZhWC{nBhiB>2i)1%e)JhNa&DHy1y
z1!`fU9qNG$?iuCjyX(;81OvYME;;qM2)?_?gpCt_d0-p)@iHs--@H3_p-KFqEr59s
zn<^KAH5>GQK+OrF=Dk0o<_PqJn*YJWa=fTXk8`p3_PA2hDiBTiV^_1Mf=_;|aL|{A
SJys8T`l;y2q~8{u5BM9ZU6)({

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..eb615ce7b45a462e651fef26a260e9973943e5c5
GIT binary patch
literal 2833
zcmeH|YfMx}6vt;^SFV>GSyzrAx_Y~Yx}r2>cki-AcJH|$6sQkGObBX&S_z>VUr`B-
z$y%#5zOc47LLZuHA3m@jY9myQhE#(FjU-m$qiMAvT4Ss=)>mTfnG05IYFgV5O_P4O
z=iZt5pP6&c%<qo+5m!|udOOC+lexxSF$znGQy4H7H9Y+k4i{?o815-``KHINFy{lF
z7Nc;VLZ2*|X*|oVFxLRZ=42^-h4djuG?RI1(%$xv#!3<`VXW5M%X1WklT*IN%hSlo
zPIAUl1}aQv>=1?-yKd%Dk2#fQz?qB{w0J0(>GaH}$F(_5jZ^M%r;;4w8cnm>lI@!2
z<r&_v-|si_q#1j>ZA_%Zrr4c{Wvqf%vH9^N<Zgz8Xw}*t4Ho4*rA8g742Gn=6GCos
z45uE*T%o5^1gIA${9NdAC<5fHZrP$Z6G815n(Zcmk$SwXE&NF8aVQR`tgP&kdhc<{
zD2kzb99aP`<`rx<IrT7}&KOGGs#O$e!b3)?Y*I3@A&z`3W34&=WuuuC{l8$M2Cds|
zig_7NOA=O@cfT<0p!-5?si85dF$*!DM-Jp#hn(uKnOz$ycU6}r#E@krlBP9>H2rf)
zv&E!6Vl2ldPgKz$#YY3Jh273qPUojL)YnHcxZJ-IyI9osY)knmuGm~7)dX>MLQ@#z
zyl%B)Yql#v$b$rB&j+%t4tGQS8F>Pjks{Ue!mA?CP(Q$Ug4#MSa-6b>&9H~!(NQ!|
zP)9_DltUqXhgz|>mrN9U6*x<h74EVTdpyOm)>%uJg(+jxWs+S7(ICg#(bizKq&7Y|
z#;S^Ua7JQSiWcrVJS?+@PbZ9MAtv!>)ha2iFE2~k^aq5>g8zL&7ZahP2cdIZ%d#kP
zB6P#>`WK1Ncp`Lx;g&5T)Io%99YuK%p^r<6&>qq*LNyExcxphc4IV2i^}qRNH7I6}
z0F`WZ0m{9MAnFOIJkTtc&ZTD3)@!CN&7T0u{sN$fTFOs61XQvs0gVuf^$`Me_>{VC
zVr2(KK)-0e|MQ3i=#b^B4N|W$9;zkUL@Wur)eI#^5lv=e57|*Evi?L8P|c*-uA7?A
z>yU{)1)Qz22vNg=(@8h1Y<S%ny~Dr3`9w55KKa+8`&~`zW!?3$zV3Hc*PG{bzv;fB
zeW6R2r`@otv(y11vdR_`t4phb;)9w4x|nKq>SEY};!HJBY&>|{FJ?GPgJKq2t&8ot
zmZ=UFv|X%+vBsC2y%Z3IiKBw#C4VEL|A*%TU9Mj**sa6le(#J^_s6JSvFWfQTbQ1E
zA#rI(Ql_|>zFrr1a7$1;xP34vuwuS0>gsM~szb%JmU-DCJ$+qJ#A&%f;i$Q+i>7{8
zbdm0RPZzmqOM*1rwKWg2MAoPiAu-n*pb(pu286ul#oFt~{i3t{P(aK%dP=A1tgx-v
zI_I_r#M}N<T}&LbT^BdRnt-U<*{suak8-n=9cnlr%)B!Jaqy+ifT&-%Cm_z>*`}+$
z9!ksSoAh^sU43`M_jNIJ#{2s3B#%`t9Cu9@J2p=W2wM%U{+chO(^foM-THc?`F_Ca
zgSAsPj)&?aU*_~MeaAa<VE)KV6FTC`5l%1jAZ)0NAdG;Q5%NMGBb=>XfslQ14#KhM
zQUu$!a|r8xx`=RV%zcCd7;D0`#xn>DFYQFA+}DioRr_ZMe8Lw9?);4ijpt4y{4(hT
zLZY(`p(tjh30Ep-n$YLfYY3%B+7aSw_aUe^KSdZfuMVN&ZVkeI=VXMaJ`kaBqyxd;
zGz4L>FNAP)MK;1)-zx~O2YMq+j5-m%Eh#{7e)0;!%7pa@b35z^#YayX(0;2w!t91J
zgxe#k5KdmWjPUFbhY5P~FcUV<d(MP}29F8PY@cp|(m39PJ^mjNS}S)TT-@*`!Vk&2
V5F(2j5$cwg8qjCVF(Y)8{|XTSht~iA

literal 0
HcmV?d00001