From ef78469515c62eb29cd513ebef0d78fb34a4ff7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85hgren?= <peah@google.com>
Date: Fri, 12 Jan 2024 22:31:34 +0000
Subject: [PATCH] Extend the APMg3 AOC control to handle more profiles

This CL extends the APMg3 AOC control to handle more profiles
to a scheme which is tailored to also handle phones

Bug: 295551854
Test: Manual testing in calls on TangorPro.
Change-Id: I17046fb373f8c1e7c21d52bc016487f6714603b7
---
 audio/tangorpro/audio-tables.mk               |  23 ++++++++++++------
 .../downlink_bluetooth_headset_config.pb      | Bin 0 -> 72 bytes
 .../apmg3/downlink_external_speaker_config.pb | Bin 0 -> 72 bytes
 .../tuning/apmg3/downlink_handset_config.pb   | Bin 0 -> 371 bytes
 ...o_config.pb => downlink_speaker_config.pb} | Bin
 ...ig.pb => downlink_wired_headset_config.pb} | Bin
 ...plink_bluetooth_headset_aec_off_config.pb} | Bin 2069 -> 2069 bytes
 .../uplink_bluetooth_headset_aec_on_config.pb | Bin 0 -> 2069 bytes
 .../apmg3/uplink_dock_aec_off_config.pb       | Bin 2078 -> 2078 bytes
 ...config.pb => uplink_dock_aec_on_config.pb} | Bin
 .../uplink_external_speaker_aec_off_config.pb | Bin 0 -> 2069 bytes
 .../uplink_external_speaker_aec_on_config.pb  | Bin 0 -> 2069 bytes
 ...ig.pb => uplink_handset_aec_off_config.pb} | Bin 2833 -> 2833 bytes
 .../apmg3/uplink_handset_aec_on_config.pb     | Bin 0 -> 2842 bytes
 .../apmg3/uplink_speaker_aec_off_config.pb    | Bin 0 -> 2833 bytes
 ...fig.pb => uplink_speaker_aec_on_config.pb} | Bin
 .../uplink_wired_headset_aec_off_config.pb    | Bin 0 -> 2069 bytes
 ... => uplink_wired_headset_aec_on_config.pb} | Bin
 18 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/downlink_handset_config.pb
 rename audio/tangorpro/tuning/apmg3/{downlink_tablet_stereo_config.pb => downlink_speaker_config.pb} (100%)
 rename audio/tangorpro/tuning/apmg3/{downlink_headset_config.pb => downlink_wired_headset_config.pb} (100%)
 rename audio/tangorpro/tuning/apmg3/{uplink_headset_aec_off_config.pb => uplink_bluetooth_headset_aec_off_config.pb} (97%)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
 rename audio/tangorpro/tuning/apmg3/{uplink_dock_config.pb => uplink_dock_aec_on_config.pb} (100%)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
 rename audio/tangorpro/tuning/apmg3/{uplink_tablet_stereo_aec_off_config.pb => uplink_handset_aec_off_config.pb} (98%)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb
 rename audio/tangorpro/tuning/apmg3/{uplink_tablet_stereo_config.pb => uplink_speaker_aec_on_config.pb} (100%)
 create mode 100644 audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
 rename audio/tangorpro/tuning/apmg3/{uplink_headset_config.pb => uplink_wired_headset_aec_on_config.pb} (100%)

diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index b7e383a..31469ba 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -62,15 +62,24 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps \
-    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_handset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_handset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_wired_headset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_wired_headset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_bluetooth_headset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_speaker_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_speaker_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_external_speaker_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_external_speaker_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_handset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_handset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_wired_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_wired_headset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_bluetooth_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/uplink_speaker_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_speaker_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_external_speaker_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_external_speaker_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_handset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_handset_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_wired_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_wired_headset_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_bluetooth_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_bluetooth_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
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_speaker_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_external_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_external_speaker_config.pb
 
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..f2dab3a7d3f7a3a12bbcd8da03d645d1495456cf
GIT binary patch
literal 72
zcmWe)<z>8g%3ex=OO8uM{eXe((cpetv*H)FJ|-4+Pkv0aTOIk_j)9@UUWti=NsEVr
bQIvt<gp=&7nKSJSGORc`7=Zi+dkIDW4|Wr$

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb b/audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..648f25662ab93784c5867e1f057ad1739fa7e929
GIT binary patch
literal 72
zcmWe)<z>8g%3ex=OO8uM{eXe((cpetv*H)FJ|-4+Pkv0aTOIk_j)9@UUWti=NsEVr
bQIvt<gp=&7nKSJSGOai{7=Zi+dkIDW4}ue@

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/downlink_handset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_handset_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..af0b87ca40da7120453b2d51ba47c324f0119502
GIT binary patch
literal 371
zcmd;D!Nk$<ok@U6X+9Iz9Hy%;u3BvUC$|0j86nHq#ZN6Sp4w|UC-~&fSDR++x-D9@
zYp*$*g+bDM^Za?Qc13wO>^>MOxAXh@HP%eq-&t368d}#a_uS28D84(XrNH`y@d9hX
zCkngUY?$`^KfQI=qtd_DMyKU=&r{{tdu+e|-hje6dwdsr+HSnN*EZ{Cqpi(N-#xZX
z(R;=DSoS=fz1CLV-Ps;QgZLnEkUU5oNIgg&NI%FNka-|;LFR+(0oez#7i2%k9U%9B
z+y!zU$ekefg4_*qKgb^-|A71j@*l{bApe5=4e~!I96;d#3Kt<(Ue9^`_EHL5a$GX%
z2MlbF2KU>V6~D0cF|n|F@?)ai>d5DI3=9qSN=zI~T09&Kq6`ctoMdOsoM~r}WyJ~R
JH`q%s0s!R@rwIT6

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/downlink_speaker_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb
rename to audio/tangorpro/tuning/apmg3/downlink_speaker_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_wired_headset_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/downlink_headset_config.pb
rename to audio/tangorpro/tuning/apmg3/downlink_wired_headset_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
similarity index 97%
rename from audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 5daa2d1c1a4a35246310d1848a2663c33cf29141..c7c5fe88415083e80bfac17766cd2d3336bda5d0 100644
GIT binary patch
delta 10
RcmbO#FjZiKFbC5HCIAtO0?GgY

delta 10
RcmbO#FjZiKFbC6VMgS4O0^|Sy

diff --git a/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..4408b6d62be37b07d477f0f45643664e3ea3875e
GIT binary patch
literal 2069
zcmeHIO=uHQ5S~f1=5?FU?V6bFwu?(3xD5uvhT;-Qb~kBDtrlwV5Q0Jp7^EOVMTMLe
z#FK*H$#@dPn>P==hJuhoB6!iW2QQv_6ME5^O$wnWp$9GW@aFx@H}B2No9{jOJ<75O
zenk}2&_p#NK#vJX0R(R5{CHr5Gf9B*8*>qXwh*X*1}2sa0qVSnD4@?J7)6GjuVFU5
z_r)=xo+KO4rp##zt0SW|6Pr0Qk_Zl<F9=u$=y_#;1AmoP{5!ORcNbuNKSR#6sO?fy
zU&rK_I7CHg5p_jKN>r0fu&~f97mG!AmBr?8aHCR>k}}zVZM+A&Gju!};4RXrorwtq
zi24(GK_pV?y_=3fhUM%7^=T<j9(c>Imb%x~I4OBogJ<MtJSBg7ca>5B?lEX4PRe$>
zJ%U<?ND-NyGw;DVZs9iECz}b8`4KrvRp8NnJvYmlqgc>E4>tiiD`(<lIoN^*=F+1y
zfA8FK4HhO^Pyh$)3@d6}<5j-T8s*>g^DOx0d<Q%zB?;5766QjUFmHXr092z~&l`)v
zCPn`mDNH{*{P}e)|EAlmjP9>4B_7Z9_M4wkMAggkY=Tv(;b2fPc%;rImTtc+^FldX
zU=KX5fQruOi_f0Bq<rBXp&6KB%VX#;8p)A7u@MGZA(u>_c02G*+lrGjP}c;iQQ|7<
zp$zMc;tbpdv^c<!uYpTOeNIB)?l55$;xA7uqcC0O!J`kKE?sF6f9MEc-ouW}iQth1
z`ahuN3{msp-%)b{dPdFv;9)sk)TGC`Sp0ZeshP2fru?zXxpUzsKV^^m(x}JkxTl|r
Lo=o~}(HY<$$BdPo

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
index bd8b7201345389eaefd40eb5f0ba4c1c1e7155a1..748426f90ff3e61c0d00723a54e491321fd5f269 100644
GIT binary patch
delta 10
RcmbOyFi&8E3<uLXCIAvv0^<Mx

delta 10
RcmbOyFi&8E3<uLGMgS6x0{#F1

diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_dock_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_dock_aec_on_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..7031feab7d040676e884d85c5a7018530b9198d0
GIT binary patch
literal 2069
zcmeHIL1+^}6#ajjHPdZE(={>MZ5Nk?;5HZt3B@In>~7MQS}oMzAq0gIFi1g!iV8U`
zh$jWXlkp^oH!tF$*H930NCYo>_Ta@+Z$dBn|0addli)!MJ<Oj!^WUHO|IfS`<t-|T
z2!2Wl)X+p#5}-!~qyPffIy+X3a3l*z{KBjxupmeU4NNQ<0@QgSB|x8xGm0ENU&Bm#
z@3Uh<JsAS0%xN2|LLfP<nb^#dlT2^`eL=u7K+h`!9Qdm=<KLncyxRcl`xXV$qP9y-
zeHm4v;t&%;lhhR<CnB0`f{poRxmYZ^t1LE$gKL#~gpA1sY~vl+ouTc~0B@0Y?Mw_H
zK-3>83nHFM?_GBcax7==sgFxJiojcbvDCe)#>mL48a$#nV=3k9o6A%RaF0Q)7#Z8`
z_6TYpB4uQH&b$ZfxP{wrmwYCK^<6qDRp8NjJvYOZqg>EI4>tiiE2rY`YOn<j%%(?W
z{?@tS8Z1n-ArB4|EH>2mj#v3SYgB*J&#~Z>^BwS@lq5{QN|<vs!o2ng15l0deco6U
z1v2!nkiqmb!yjMPa<97G%IN&+a{S?3Z@>8oMMS-*%*NT28V&{(gEe(FzI5|>nJ3EO
z1V`ZU4XEghKL6yYOU7sJ5t@N1_B@6TvymOy6B}Wo6$;7pX|)62EZ8v$2I`tXHA1vQ
zJ(S@+qdWt*0WD52<ZIxPQ=f|vxI0YP1o4*#wvnGMv-05G#|xKQ#2?xMnD?-wa3NT;
zLH`HToFQu7|1)Y%Ku@XpA3Q84i<<N}7mFWGDmASF(Ud=SC3`0P<fjVbzBKBwI_~MG
Nq9>DnTXfz_zX88`m4W~O

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..46c01ce894d55fda55bc031b97dc86c8a38902f8
GIT binary patch
literal 2069
zcmeHIO=uHQ5S~f1=5?FU?V6bFwu?(3xD5uvhT;-Qb~kBDtrlwV5Q0Jp7^EOVMTMLe
z#FK*H$#@dPn>P==hJuhoB6!iW2QQv_6ME5^O$wnWp$9GW@aFx@H}B2No9{jOJ<75O
zenk}2&_p#NK#vJX0R(R5{CHr5Gf9B*8*>qXwh*X*1}2sa0qVSnD4@?J7)6GjuVFU5
z_r)=xo+KO4rp##zt0SW|6Pr0Qk_Zl<F9=u$=y_#;1AmoP{5!ORcNbuNKSR#6sO?fy
zU&rK_I7CHg5p_jKN>r0fu&~f97mG!AmBr?8aHCR>k}}zVZM+A&Gju!};4RXrorwtq
zi24(GK_pV?y_=3fhUM%7^=T<j9(c>Imb%x~I4OBogJ<MtJSBg7ca>5B?lEX4PRe$>
zJ%U<?ND-NyGw;DVZs9iECz}b8`4KrvRp8NnJvYmlqgc>E4>tiiD`(<lIoN^*=F+1y
zfA8FK4HhO^Pyh$)3@d6}<5j-T8s*>g^DOx0d<Q%zB?;5766QjUFmHXr092z~&l`)v
zCPn`mDNH{*{P}e)|EAlmjP9>4B_7Z9_M4wkMAggkY=Tv(;b2fPc%;rImTtc+^FldX
zU=KX5fQruOi_f0Bq<rBXp&6KB%VX#;8p)A7u@MGZA(u>_c02G*+lrGjP}c;iQQ|7<
zp$zMc;tbpdv^c<!uYpTOeNIB)?l55$;xA7uqcC0O!J`kKE?sF6f9MEc-ouW}iQth1
z`ahuN3{msp-%)b{dPdFv;9)sk)TGC`Sp0ZeshP2fru?zXxpUzsKV^^m(x}JkxTl|r
Lo=o~}(HY_&$Bvbr

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_off_config.pb
similarity index 98%
rename from audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_handset_aec_off_config.pb
index eb615ce7b45a462e651fef26a260e9973943e5c5..748990f74d0d0cc485643323fd8c50c65450a3f7 100644
GIT binary patch
delta 10
RcmbOzHc@N?KR44RCIAti0?z;d

delta 10
RcmbOzHc@N?KR44!MgS4a0_6Yz

diff --git a/audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..a9dbfbd56fee954f28e52b447dcbfbdddb7df403
GIT binary patch
literal 2842
zcmeH|Yitx%6vyvvcj++fg=Oi1rLZtAsVs$>W_M>hDczkjEk%kvN+}5`U`m08R0yvC
zO%2H+f<zug6hrX=5merO5CaIL4G~gEAvDo8JdA>AKtd1+@=6fToh`Bu6GcB56F=;k
zojd<??>YCJ-@WR`Tve6$ofJ3sa*caZ6qb>uFkmch`g<rGF4pcdeUs~kTYjg)+z)wH
zio%16!rjcvG@j>En5VbmaI=i=Li&&+T3(*nYk!NOvC?$%Vct}&bAT5loQ7+>Jd2#1
zBxfw6kHU1u8ZpY)4XcPotSK}D&R}fBQ9lJ!Nx%8@^K4I3)0F$%t$0&B!)R8A*Qsd%
zo)d_MLLswAn$f44N5x7ViqoAwkyY@SY<?FKav#IKv}$eA3yX7}QKR-z`a!S#;|w1;
zMl+A(uF$h70@O>o{Zj04DFWoIKKVv*ri0oxAm2v<GxJn)bM&#)?^0Y)RaKRc2JUmp
zD2~Q`j%)-k;T3E)IVBl?dkQ6Q?^PUW!bUSwzEU!&21h=cv8ICmve7Jx{$DV0lh*Ap
zC43^!>MQJR-uvRz2H(ZnGE-x;$J}5=RKHlzFTWProlZs2tVC61X?1A~hAc0gG))Dh
z=~+mcEfy7uu>yx|tC4+`Abn^m?r^@^Iy`$*eSM4;pdyw!#iH)#j+VD_#o-yEb`#ge
z9f*RQ*Qd5^&G$S#;M-JxR<;2%Go(5c`dp&aXg*TQ_DX~*-AP?<X38;2DK*DwsMvL+
zPsr&(b~}aiJ!&O^PC1Oy=rqDzGQHHRaF2ty<r%iMTP|Df&qP)!(@gZENv^fS?2pwF
zUbi>JehKu;Nsmg=!rjLP=GO2^VILAqo&qd~SF5D8{|8vc#y>z+?)=|JbupnTl2D!F
zS(Zn!6RPV6)xSijb|F+3m_GSNsJaN%twSjjLiI^0p_(L3psJzK`<Y3#i#%HH)&J(7
z?Li46QhOyDP(qp@l?SM+43-3GfvjgCHKS%x=`~B2=1(AHe*x0QqvfX`K`Qx`kj5ln
zF@ki^<hl-O<p4!MXEm`Ivmx!je3eP+)#f9$&7UpoP&1V9#59?W({Q3P(oQr+Bx@GU
zcEi$w0hdhl8Sre9n-DiU@Z<?ReL0<@zvEd+R~;>pfHN6Qe^8!WbkVC>o$O0LHQ4dY
zOFVf&$CEBDstet|JnN=You&2`u{RxtSXDMNB0j7+qKhe3yDkPUD9KgR#fFB~keKE!
zi-=ill`eMZTCUoUD#}=rvA-`lcR4JI(}zaLOCBVm=SLU93D<8H?A2jXk9WtYhf~ym
z*m%s9FD(CkLtNh3D_7jgUZ;z@xFsSU-f4&kteCHhy1LuB>HsnI=)8Q9oxL_9(zL>e
zaMfJV#ep7Ib&(x>Ul)a0OCmJg_0<paMBdQThL{@&Q-}wahK0QF#hM$ZLZZFAF)Zes
z_*$pw?6B?F+UK@}#XF%)U5xL$Ll-y2>adu(>!424J<iQmwyDvuu!_!xMZ?SOVNt(u
zUsznYyG>VvNlM%2+wAuuiLrap2f7$A?F0QO$rC#lO}nm(otr0wg`<X6e=TU}REo!|
z+yCA;_#kYL!I~)>#zOV+FAI`P_p$B*m_H=fg0{4Bgw|z#g!NT1guyT!p~(0I;av3!
zg#1f$5KhLIA~?34M_BvwC4}3f9v~dSR12o=Ig7CH@-Bp`LkAJQYWWO-kNX0_H+%!a
zp7X5;zfL%fknV0q7@4xtf~!?CEa>{`b%e6xEeKs|4<V?xwj+$0SBFq>uLj|;dlEui
z?}Jc0#D(BI&>vxO&_KAhA|K)H9~6Yw!<`Yv$K43um5xAgfBFi-%5Lir=C(NzN=}?H
zq2+c@gxQ-WBHS4~6XDFoD+tf`cUhnx9B9Gjc`sPdZIj=E=XO+DpzIlI!M@N>2u)Qx
e5iYHN3*kraZiLvPJqUHn%S`Ax>ZEC$=Dz_z$c<b8

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..4dce7c9e0eec3bb77671e4ee7e85cc14c6d0e5a8
GIT binary patch
literal 2833
zcmeH|Yiv|S6vt<_yYzCqLzkro+QPzhNo6V2G`oAZYw7Mix24!t9;K9|DPVX=(^Lqw
z1ZZkV77--8iYSKG2So6}qxeA#R3J1&NFhLIf;2pgf@wfP5DD^15YOBeDMq5`2V>%g
zd+wc?|Cu@G%>3@CA8}PxVz+HBp3F7wwka$%USYsk%<%S6I9#aPWq2mnk21Xug}EN^
zbeqEc3VpI<rtxf#!rUo}-NjOS3+Y3SXeRTte!JVk8Y@Y%gmGF=AJ0`3PEMmVUY<@)
z4w5sL+FxNhV=WkA?7EpxJ?0de0cSE+aL`M^OsA)Y9{0w0HD0;LT}raeJ(6a%Cp$FF
z$1{DAKp<e`OEc#9vC+{IyW(&qm9eS3lGP-Tkb4*opjGR-HCT-E)LON_G7$Rh9v}9Q
zV<c^V)-pYVB0#-3@#jLfQxPC%^~e^*nFMP4;2aMLjI`s&jzu0xy-vjm6%`eoQr|sJ
z8O1Psk0UGK#e6E8O-|j6x5GxsTeXTIP1s_j$tEQe7v{*vFxHy;UpAUa(f<o3X3)A_
zrkI!U^nSuB^UfEh9q?SJD>XDmHD+Pv_sW4h>yT6ZHM4U=<*w?|gc-8zB+|6zlBRDS
zX*QX(M~vm#<%ud9p!jK^wXn<i%IQ%VjSUUaOfL7Y#32^+K6|kI6j$u-;cB9|I(|<C
z<h&lWeRGaGQOJV?WzPq5tPW3O!x?!3n2{>g)sYoZXlzI^o}jkQiyWtH;xZlK1aubl
z7t|4zA>~p?-=S9Q>md`x9tEzFWQDu!#2!zztaa8hWMRtKbeUx5K{Uv*ZlpC>C8<qF
zwpms24a`i6NYVTqhlXU;^67*TEyN`LtV$)N_2px!8~%V$S@6G4=t3e?bR%?*dr3A$
zPK2%-+VCO~nm~lkGd!|IggS}P%_AreBJ^=75!y}KNvMY5l&1#N+Tby=QvaKOR)b>p
z2vEspC!pNN2%_$Q$^*^v=v-<hZM|md()<aa>@NV?a<KfwLqH|F63{52*bpT^hfc2V
zB35=#1oVpz1U`>ifDT%^(jfIJ<DpujO~jJ0OU+Pn6xC!lj<5rjBI{2i0o6>J?YgP?
zeNLI^Q^46Oix4v`I9+tZ%7)LA*)#GRoKHm4>z98my5H6G9@bqS=kI!FcfNUU*PHGu
z+84TXdHM~9I!jFv(G~WvSXo*b5+Bs=*TodGLl;Bl6=$hQV*P>B0Wrf>8WOYEN?mN#
zwJdd@pzUJaj5WUK?4_V6Od1g)FZml0eLp-O>~#Hl-cB7R^?7Hky3eNi#D+u89ASFz
zg~g?9{j$W(jJ3MBgPTI)!R-Sffm3UAQD1*6OC2nx9jwj~85wIrB3{c231{tPUF_*|
zMHd<V_jHk$z9>Y~U0d}aTV#(o5f*cOK?-rt;-HZCyjXqxctCWNw*<wUBd2tl&I;R#
ztz&LmP`n*T)5U}VTXk_mtO|<C?aew(_b4|@*{(){!puJt6bD}F2#SXJyMp5Uoh`cR
z@20eTzR7qu)Y*48a$gsNXS}cfPV!jgBJtOBv2EkTps?4{>aY33I&H<H)vd2Ln(qg#
zK3F|v{Wz#P{AF%8(|epN7ixxQnb00zj&OR37hzpR6k!;=jF2Dx7~yQyGK8Fqa}bWk
z79-fVoI_ai(?x_^qwgc^$2b$FHJw42e`z~H#olIwui8FC;N!nQ@QhlI&~)xJ!Y>m~
zASAhtAr#q`n{cIKrU|`Xy@pVFxD6qpZZCp*^HYSe)%6Hd@75yhb4@~s>HQH3hdU7*
zdj=sa^oJ3yF3Ul9>w5*^^<Yng2{9MKw<QG#u1{V;Sf02RVQ#wvq4>y21KMu&MVQ@K
zhH!gWCBn%Iml2*F<TOEV9%91A>gP;IZ1kG&%+~29C{5!`*cJE@p|xTg!o_uOBK(lN
W10lMg388*zsR6x4A2q^FwqF4d%7?rF

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
new file mode 100644
index 0000000000000000000000000000000000000000..b52d5f00ea8cf35b52ebf8fb01b7618180a280a4
GIT binary patch
literal 2069
zcmeHIL1+^}6#ajjHPdZE(={>MZ5Nk?;5HZt3B@In>~7MQS}oMzAq0gIFi1g!iV8U`
zh$jWXlkp^oH^GC4UPD31ArZXj*@G8Py$QYO|C<y-Pl5+6^e}(^%zuC8|3C9)l((oT
zBKRpKP(u?{Nq`;|kOBx?>+D!D!jUW>@e8w(z=9wZG%&Gb2vFyRlmLA$&M0#9d<`?{
zz0Zyb^<)T~GN)~<3W4ObW@0l-PBOs(^aTOS06nh^aNw`fjDL$(@NNUF?^_g1i`p(V
z^<`9vibG5YO;T5coQP<$2{z`N<zlhuuCmx14z5+|5i%wlu#I<McZRk{1H47rwKFk*
z08xLWEQok2y?5O)$g!Ncr#>#_C<1T!#ZvdG8Y3gGYVe5SjHQ&XZ!S|Qz&!@FVq|Q$
z+asubh?J4(IrAQ@;}&kiUGkX_)_3WsRDnn9_1p|sj&eZ<J=_H7telF!tHBmDFq<Bg
z`CI3PYp^iUhCDb>u-H)JJ6`4UtWo_<KgWVk&Ue6rQj#$JDq+sm2=m$}3_vx)_jzMc
z6v)uOLI%^%41auC%f0G$E2HzP%khVEz5V7V6cP2JG8<=8YB(5F4A#`y_|nbiWu7R9
z6C8oZH=v?3`uvlpE*YP>M`#A7*z*`V%tm%(Pi%yVRwyLXr_~O8vtY+47^rIk)d<lJ
z^-zZQjPeZJ2DCWAkgtJDPJJ#y;O;PC6U1L0*hYT3%*umzA1_>L5r1e4VBW)y!i8YX
z2K^sUbB3sS|Ies70X?PWfAFxJENar@Tr7S#snoOzL{t9QmF$`Dlb<S#`_ib#>bR$$
Nik?jRZP9rz{RY2wm4E;M

literal 0
HcmV?d00001

diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb b/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_headset_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_on_config.pb