From 846117a2348b560b99c5d79dd6dd09b2a7758e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Gr=C3=B6nroos?= Date: Tue, 20 Jun 2023 18:35:58 +0200 Subject: [PATCH] Install APMg3 external module and tuning configs. Bug: 292144567 Test: Manual test on Tangor with Meet call. Change-Id: I1516875745b6ad3696eb5c179866646af0ea5981 --- audio/tangorpro/audio-tables.mk | 8 +++++++- .../config/audio_platform_configuration.xml | 1 + .../tuning/apmg3/downlink_dock_config.pb | Bin 0 -> 340 bytes .../tuning/apmg3/downlink_headset_config.pb | Bin 0 -> 340 bytes .../apmg3/downlink_tablet_stereo_config.pb | Bin 0 -> 340 bytes .../tangorpro/tuning/apmg3/uplink_dock_config.pb | Bin 0 -> 2074 bytes .../tuning/apmg3/uplink_headset_config.pb | Bin 0 -> 2069 bytes .../tuning/apmg3/uplink_tablet_stereo_config.pb | Bin 0 -> 3746 bytes device-tangorpro.mk | 4 ++++ 9 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 audio/tangorpro/tuning/apmg3/downlink_dock_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/downlink_headset_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_dock_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_headset_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk index 3ea0940..da4490b 100644 --- a/audio/tangorpro/audio-tables.mk +++ b/audio/tangorpro/audio-tables.mk @@ -61,7 +61,13 @@ PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \ 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/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/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 # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index 76c4136..fea8544 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -286,6 +286,7 @@ + diff --git a/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb b/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..2e98cf57a6320763843229af8956f4b811294302 GIT binary patch literal 340 zcmd;D!Nk$uyiMnR_M|DDK_Q7qhq5ZQq`>1Ch4#RPNd?AX29>`pf`5=2h_JQmL*$;9D$UPu; zf!qgjC&;}ZcZ1vy@(0L2Ab)}U2l6M#zaW2u{0|BTP{9L4T{&&1z^Rc20BduSivR!s literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..b4622087fdc642fa4f5abce5e681b5930c4abafb GIT binary patch literal 340 zcmd;D!Nk$Bg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8M07u25LI3~& literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..8328669b685ba52a71737e4fd201543595ac03a3 GIT binary patch literal 340 zcmd;D!Nk$Bg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8607t{3KmY&$ literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..fbdeaf546f46a2557f61f51d883e9442155c712e GIT binary patch literal 2074 zcmeH|O=uHQ5XWbdZ2P(amBNeINgM`)1z!_NmWM zRYmo?FN`sisQCoMI|W1ms#fBlK)0b^HSakIML_rmrhEc3LSPtTATg&4(E3Cm4Dp^2 z`;gvtVwmh*dzY0^iI5M({Ibiyg6A|YaV|wp3dsTD{Q^b+)@>7D%Ne5)=RB=oUj&%g zNYG{$=vk&md)%pZifs&wm`@v}RRb|aN(0k#=J4>aHO8j2*_h5(0zwH#W?>#L!SVqT zq7L=|eRbuR4pb52H`RV|II4a;dP?7HG)#BPL$m{Xq}=^&QVWVmloqsf?$JIYo|J=3 zveT|K!P3RWMNevMBSj?b>^9mkfn}VB%N**iNqqK&nz^dlIz?|Kxl6%d7Hup6JS^^; zwj4-@Qu1e0wMf!5Wt_!SZ^%vai_;fg>7Q24S`yqGLngr!MXv1vXV-H=9drSL#wq~-aEgF61v{AzA^V6ML;{Q zc89oHsCb@wb*8ls>{LKL&T1}V-kC+?V3GRk%uACiG4Bp|>eX5wN8?W`S;g*{>Th|~ zy?A8V=t={H;h%_9Vgj`Q0gG|hy0u2JR;^iB;2>RS-OtsF?&K0vs}RIIXBcU}$&G8z zUmrWMKoHU9fZ>NFm6O3O1LBW8m2qI6=gFD9-c>T-?3=&uGLbrFv^~7YRS8ozq1Cn=nK6R&uYf(G8E&Der@Q_F%|wPU<=b6Nb+|XZKhu2Yyf+q_Z@R7MT>KT) z5KoGNC+kTNZ{B+i1tDM}c+s;5FP?f6deNCp3#F%m;3A-#%zKmT}fc^)Iia=io)WHM?E4Bb*N+>#5<2kk=yo^mO zOzwUS9B53C4VY(~Q4ebaqa_E|i)5q{9Kf0uFb~j?A;5mTNGtIj@*wX5EbqA#OpDqU zHRH{QHX;sC7p7t?kk^cJ)E1Hixyd|_Io#~jf_zBi6(5|J=i)&K(s;5(5~CZ zCXgUnPqb-~%TMm!3~VwC3lEH^l@diD=U>n6TsN|$WUn^QD9&tN`~Lo_O@QbG)XkEz z-EI${-T_iZjtr(GEaMt(zV$b069%A`p$i2o zGr}iD_ZlgjxX}OgZK?EjXQw(izlNH7Jl@$`|AHc8T-L^NtjhO$y{gS4V=Om&`&Gyb zVYH0)d{@AtR*}*68ANG|&uhb5E`l;y2q~8{U&-fREPn8n@ literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..2872f039ea8446266502e5b91205987143a1725a GIT binary patch literal 3746 zcmeH|dr(x@9mmfFHe9azlNC9*q8m3$2`fsp%YAHk?4Ap#K$TZCWiVuvD6tqLkQynO zG#H~XqF@vfK@GGujTq5ss-wghsZ$JCF=|>-W5&_SXdLS!HEMLM{hhlKz{Ip^^Jo6p zv*+IPJ-_pNea@BM79>fmxb9~Wtb$z#@e@gSphzeo6<)_+Q7|U9lEf*Mf^o{tvTOhQukIMA5_{FUM_WL=;XDBct-qSY@X1+4~HO?JCe z80$=ojg9q=rU?f$@ z5~h(kXtmGa==Q_lja*eQJiFB!$saKolUrcIBtqJgejM(}fnCRxeD_e{MakVEOUMTJvz1 zk_?yZSLbx#+y@s(?cymbs57O6&UffuoVk{PMY7-D*zUE9A z>z~Lc^ES0bX$1%o9z!_%q)6h);4>!)U;Qn7@^t6@&wS2DK7kI|p6$joO-ziO8?rDC z{YE}lj;#9`@(GkvZ{ttMry2SDT|7pCDEF5lpJpGQT>3SiL%%nkMtLXkJpDNQe>un^ zy?AmmeRv8^!n?K)p1hq&GB)B5kLQ6NJUN-1Mh}8m=Rx2`K2d!aPXk)savTMZf#--t zm0naY^Y*AY$3D9ItL;1*liS3^bmJc4c-nQ0=dx~hInDeY`W|Su^CVPw4Kyu1XxhdG z{TFCDT!<bjM9MoZUD?gR3zs6u7|}Rk(9~w+d`psRGs2 z*EA^trtc|9fS8yn6$0(aDwxa8DX?Skc?DuzYZXY2eo;kp7nj|MgShwuZYXxj=;DqA zGVIb8E3o`>XDoE*waPHJn=VdLrrX?0*?)EQs4_%Cc~_ETNE_c8=Il* zk`iUm#~qVl_mkZ+)Xm!}!-*T~70J~{Y3%tdW{v85_f_I;1tOkWr`#jym$}5iiwbOP zm?A?!8J_;K%dKE3dQUfIueRKljdyf;er=|7)E|#s-?=9qCj7z@2hA&AcEhg}(4gz1 z0u|oL{D}tJO8%fh(XfLm*iSyI!pFyjM=|o3K8i?y9rNFI!vp7*Yf!WGryA^jZJq{~ zOG7lMd~J$~q8q^r?>zOJ%dFBZjA|4+s!=%nDPE$g{Czr z8a!;qf_-xBJ*{8Wdu?W}J|n|~8CDf$1c-{!Q}EGfv);FrZ;D)7+2 zH)L3{S(RbU!L70IR@H#7$yi&Jh8>#}sls2{_Ns96Pt#Sn^|Y$MnSudozusKhVZPhy zJf0r1jM%0gd(+pkzN)HiV`R8;_``20vmw7V{zC;S&rDIF@sTYm{PE}8Vqw0?bH7g7 z^2H_@=mk-Q2__FVZi=A6@s1RqGvDka;|OCIW2XvqMFpvF<(T1EarK=kl z%_ym6blO*CjDBF5%4mf$jM22wW=2grMld?xK`%XYEsW7Q^|_2*A2o~7gQw0h`tS&|PL-A@oi>y_qSN4d yhfW`AD$uFeoT<~Tv6mQaFWkuJ>6NcD`nh!zqn_uR8LeJ4*-Hmb+~;+72>%A@6->?m literal 0 HcmV?d00001 diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 29de848..ebdc52e 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -274,6 +274,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.multi_usb_mode=true +# Audio package +PRODUCT_PACKAGES += \ + audio_apmg3_aoc + # AudioProxy PRODUCT_PACKAGES += \ libaudio_proxy.google \