From c9cd788e18c3ad6376e0ccfb66f57b493988bdf3 Mon Sep 17 00:00:00 2001 From: chungkai Date: Thu, 7 Apr 2022 06:28:08 +0000 Subject: [PATCH 1/6] fix path for i2c peripheral device paths are changed when we enable parallel module loading and reorder the initializtaion of devices. Test: without avc denial on P10 when booting Bug: 227541760 Signed-off-by: chungkai Change-Id: Ia94bccdf479262e96210c2eda4794c2708e56861 --- powerstats/cheetah/service.cpp | 17 ++++++++++++++++- powerstats/panther/service.cpp | 17 ++++++++++++++++- powerstats/ravenclaw/service.cpp | 17 ++++++++++++++++- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/powerstats/cheetah/service.cpp b/powerstats/cheetah/service.cpp index a7b0824..2f9e715 100644 --- a/powerstats/cheetah/service.cpp +++ b/powerstats/cheetah/service.cpp @@ -27,6 +27,7 @@ #include #include #include +#include using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -100,6 +101,8 @@ void addUwb(std::shared_ptr p) { } int main() { + struct stat buffer; + LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; // single thread @@ -110,8 +113,20 @@ int main() { addGs201CommonDataProviders(p); addDisplay(p); addUwb(p); - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); + } else { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); LOG_ALWAYS_FATAL_IF(status != STATUS_OK); diff --git a/powerstats/panther/service.cpp b/powerstats/panther/service.cpp index 094db17..ed76ca3 100644 --- a/powerstats/panther/service.cpp +++ b/powerstats/panther/service.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -57,6 +58,8 @@ void addDisplay(std::shared_ptr p) { } int main() { + struct stat buffer; + LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; // single thread @@ -66,8 +69,20 @@ int main() { addGs201CommonDataProviders(p); addDisplay(p); - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); + } else { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); LOG_ALWAYS_FATAL_IF(status != STATUS_OK); diff --git a/powerstats/ravenclaw/service.cpp b/powerstats/ravenclaw/service.cpp index e3196da..0f6db94 100644 --- a/powerstats/ravenclaw/service.cpp +++ b/powerstats/ravenclaw/service.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -61,6 +62,8 @@ void addDisplay(std::shared_ptr p) { } int main() { + struct stat buffer; + LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; // single thread @@ -70,8 +73,20 @@ int main() { addGs201CommonDataProviders(p); addDisplay(p); - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); + } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); + } else { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); LOG_ALWAYS_FATAL_IF(status != STATUS_OK); From 970a2bc9d2ba547777bd73d2cbc86b261de6c5c5 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 7 Apr 2022 16:44:35 +0800 Subject: [PATCH 2/6] Set audio.camerasound.force for JP devices Test: set to JP sku and check No camera sound option Bug: 227405874 Change-Id: I9f647175ac83d12ddfa1d54e5deb419dbea63877 --- conf/init.cheetah.rc | 6 ++++++ conf/init.panther.rc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/conf/init.cheetah.rc b/conf/init.cheetah.rc index cf1af49..af53fa9 100644 --- a/conf/init.cheetah.rc +++ b/conf/init.cheetah.rc @@ -32,3 +32,9 @@ on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_complet on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 write /sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs/high_sensitivity 1 + +# For Japan sku, always enforce camera shutter sound +# Since this property is read by the audio server in system service, +# it should be written by the system init. +on property:ro.boot.hardware.sku=GFE4J + setprop audio.camerasound.force true diff --git a/conf/init.panther.rc b/conf/init.panther.rc index b3cc621..8d2bf97 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -12,3 +12,9 @@ on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_complet on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 write /proc/focaltech_touch/high_sensitivity 1 + +# For Japan sku, always enforce camera shutter sound +# Since this property is read by the audio server in system service, +# it should be written by the system init. +on property:ro.boot.hardware.sku=G03Z5 + setprop audio.camerasound.force true From 5e1c68913079fcdc12ef54eaaef0037456b312ab Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Fri, 1 Apr 2022 18:39:04 +0800 Subject: [PATCH 3/6] audio: update speaker protection bin files Changelist: 1.Enable Top/Bot speaker FIR module on voice call Bug: 199029784 Test: Builds Change-Id: I8e54a63830a32a4d41f257a5187d722ec199a368 Signed-off-by: Robert Lee --- .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin | Bin 5192 -> 5204 bytes .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 5220 -> 5204 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/panther/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/panther/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin index 797bfc59ca7f383cb2cfd242c8f2ecd21adff956..0cb054e6e328729e83f2833e1758c463958e3b27 100644 GIT binary patch delta 898 zcmZuwYix{J7=FH)ju~UnPODqBw1!gAGGml>WlK`3lKv=}l}a(S6s2Zt6;)vxtDALA zn;}}aN)ZtuvCZ1lC9Kti`msb^o9L9*Xcc3oo#~j%wR@dOG>`Fdksg9?8NUx>}*8ufP*YANwn* zU|+Ilw6Oi?;~jdgcvXVqRPhwue)j=(@s)|0bQ!x(^EKZ*WG-LzwhIP33)s$%{hhtE zwee9rx3TMGm!J1}JBRDoIpbM7ukm^hKe2i7UkiAPH!bYvnfPPfyvj=#*vd1tO*S6k zo)QLm_s{3KJivwuHnKzevVt!VZ{a5TXHCn)Y!m_(6o(tiu@n2><0_sk>wkxRs7}IK z*c|`VAIAwajE4hDMh^J}zhjvfb!_fDmkm9iUf^i9p3=04VD(PiKz!Q!Dol}-8wAj3 z+jv;|S5|tKj&N^Wp;b1NHFMc5#neRgMadiG*DWUjy+;U}1t z#%hL4;mIO9ZzAt8&>;#pKzAws6KxCM5_sP%mNL9N)FXzj&&gdPV&kERe9eeTKqY<{ z6#MJSwo6ggvERrb@4GUvAB=jS7IH|;E-oo6Dz!`6G4={=t$j@N(>P(QOHu2}Hd~4< jYs|%~bU!8P^yLPleP~QdWNKPQy549orW3`IInKqJ9d&FnFUM&Og|TLgk_yU9Q*)Qn?QSt(4LW66VQcJCBWAVN zu%?Sbwfn1$YTar#BCsYcO+!k$Sy6`3h003OGnX^dyq#bBw+}ve`FMW4AJ5(NuJlGx z$lI5imTb$i+6$_yE2QRF^FH9wn^oKn`*Z`8upYQYQOR z{L4^1e}grTiELVylgm4-@5XEPwVjGZ4%_BX3ti#aCjJdE#K&wspl@dvPlr*)3m4m; z)8*y4LSCc%YfB;j;b1REcy9PZGd=7GaTYzNFP`TxJ#R^RZ}oVT`^VMX!>*+x2YG{? z>1^Q5k)A4s`OwT-ermZp%-du+V|c$(RnA9zxCbxU|JQ&GDn85POK5k#DCZ04i`Yun z>m>aLzTvw=u<%{(kN^YUFXKtXeD|@KLx`I|BcxQ>&N z`k(3wG_X8DGveealaws}h_9iqN!4Qt#$@0cGG1v*k%F|nXoomB(FHBU!>EUDUdj=O z&=sH%NhMk*l9Av?8WPJ)hZQDaAudC6z%(94s8i98*x#c>B^&B-53$=^V+RlkgAwZy zA&p&uXb5j{9GXF7Lx-q3)In1lxq@Ltm0}G;41A+-cL_gHZr~G!h662>7|NtTX;-k30ZOx`QBD8Pl0~V-Kb^BFxB93+ z@=v@^sX(dDN6E=z`mRftDAPBfyhGmn?~&2Vqm3?74IrfK|1;06F;suS0e7>Z*PRtJ z!QB|s9BmQj7nO?homDlCE$)oiK9k~)*`hTovN$(Z*qv+5Gexs?o6Y7n#aZ+=+l=X1 OGqR^n%{FVd1D^q~IIeO4 diff --git a/audio/panther/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/panther/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index b6882402165940242ddab09ce1df5ce3bb3b38b8..a29b144c5918883f3497b8fcedb5a84c72552ac2 100644 GIT binary patch delta 864 zcmZvaT}+b)6o%ig{Q^QOwNjMf*48f}>yT)xg4PHZF0heE;_tE_Oczo?j8a{6k<_Ic zgVqIb1g1nyAOe%|6QRwF#)U<^*&vu{#Gh!;qWBYqVOLsh`}OtP-7Y*A=Ulwc$w^M0 zCze~5pUlGg#>Lq=E0){KtV(ly=5kf;+V1$&W_1*OvBkE>=Gf=j<4~fN#U-1TmRD6b z9hX|Z7{;TfurPCh5}?j6M_l4-9i`(Vf-FG#ydkHSdjCSV+@+3KjLGU zhItoA5{K|1^yjb+npG)ZLyvSHP9bSb9951jcn&w^w&<+FEZV{Oj3q~%$U?^FOku*q ze1(~(wbRYS8TlUOBCU?4jJ3b{3u&0!z-GP~RK(Om)5`*e7;@(=UuCu0 N?e_dUDfI^^^$yH;lhyzL delta 880 zcma)*>u*y90L9O}-70%^cFs}Kt?Md}!j^h(g#!Bkm^dF%LnRvt1k*vpS&?;#8_cMw z!6krv&{-o6M(7g7NCYx#2p9)!fhlPTfo&3C4kQw@g<+t#kGuBXg zxchJS7f#`g-nvCz*((KJ3WeI<+aB=CQlM#Lv)myCIzt_S&aU?Dffv>{c>~Qmw|2|Y z3eUD+JAmE}_q+-~{KO?z4n|)S!jqmtoMG=dEa%-9zbt@_BZoO3 zmXY5>+>44`yubr@kmL~iH=~DVk4JAXoafNjY~|d}^Fce30rle-ldXWaEdCGC?=>z9>*}BVYQzoEOcqdn1}3V4(0)0t07h82r)n9Xn>DeAG#p5 z@@+V=>?SMVoLpjs0OvipA=W#~un^)9&Y`YRd;kX=uj2@6*4y8Q2>S-e5Pq=D!UlYY zFe+ymL=~*pXvR}|*pj9W>mGQRKUD5SDRUmgQPiW}Mk$_H%rhuHS&(5C^M1xGGl$I6 z5Sfm`51}@79fjlpE`#a5Ue6T7<1C``lW>q4l?@nRUQh}F=BoJzIX1VANph)yJvpjJ z4HC)tYObNWDfx&x)e?HBso4oC)Dk>NWtVn>St?ifBeMgkwMJ=nki*nQ;bbZnEqJF? z@JEWQp?a^p{Qv$S)@N-KZAQS=Q0y{Z5^Qe^1mAKsI$ct??2Xte8!WOUt&&$hw{n%w IRs1pj19Ww@Pyhe` From 80e905ded6a1520cf29d87675577b5ef195ae33b Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Wed, 6 Apr 2022 15:47:21 +0800 Subject: [PATCH 4/6] audio: update fast switch config for speaker amp fast_swtich1.txt => Enable FIR of top amp fast_swtich2.txt => Enable FIR of bot amp fast_switch3.txt => Disable FIR of top amp fast_switch4.txt => Disable FIR of bot amp Bug: 214487028 Test: Build pass Change-Id: Id7c9eae52d9e59250cbc7e79705d86d0268a7a79 Signed-off-by: Robert Lee --- audio/cheetah/config/mixer_paths.xml | 35 +++++++++++++++++++++-- audio/cheetah/cs35l41/fw/fast_switch1.txt | 1 + audio/cheetah/cs35l41/fw/fast_switch2.txt | 1 + audio/cheetah/cs35l41/fw/fast_switch3.txt | 1 + audio/cheetah/cs35l41/fw/fast_switch4.txt | 1 + audio/panther/config/mixer_paths.xml | 35 +++++++++++++++++++++-- audio/panther/cs35l41/fw/fast_switch1.txt | 1 + audio/panther/cs35l41/fw/fast_switch2.txt | 1 + audio/panther/cs35l41/fw/fast_switch3.txt | 1 + audio/panther/cs35l41/fw/fast_switch4.txt | 1 + 10 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 audio/cheetah/cs35l41/fw/fast_switch1.txt create mode 100644 audio/cheetah/cs35l41/fw/fast_switch2.txt create mode 100644 audio/cheetah/cs35l41/fw/fast_switch3.txt create mode 100644 audio/cheetah/cs35l41/fw/fast_switch4.txt create mode 100644 audio/panther/cs35l41/fw/fast_switch1.txt create mode 100644 audio/panther/cs35l41/fw/fast_switch2.txt create mode 100644 audio/panther/cs35l41/fw/fast_switch3.txt create mode 100644 audio/panther/cs35l41/fw/fast_switch4.txt diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index b268f0f..7cccf52 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -105,6 +105,12 @@ + + + + + + @@ -635,6 +641,14 @@ + + + + + + + + @@ -643,12 +657,21 @@ - - + + + + + + + + + - + + + @@ -656,6 +679,12 @@ + + + + + + diff --git a/audio/cheetah/cs35l41/fw/fast_switch1.txt b/audio/cheetah/cs35l41/fw/fast_switch1.txt new file mode 100644 index 0000000..00d4d29 --- /dev/null +++ b/audio/cheetah/cs35l41/fw/fast_switch1.txt @@ -0,0 +1 @@ +11,4,768,1236,222608,131072,2167332,1,7,0,629947780 \ No newline at end of file diff --git a/audio/cheetah/cs35l41/fw/fast_switch2.txt b/audio/cheetah/cs35l41/fw/fast_switch2.txt new file mode 100644 index 0000000..1d7bd81 --- /dev/null +++ b/audio/cheetah/cs35l41/fw/fast_switch2.txt @@ -0,0 +1 @@ +11,4,768,1236,222608,135168,2167332,1,7,0,919471758 \ No newline at end of file diff --git a/audio/cheetah/cs35l41/fw/fast_switch3.txt b/audio/cheetah/cs35l41/fw/fast_switch3.txt new file mode 100644 index 0000000..671662e --- /dev/null +++ b/audio/cheetah/cs35l41/fw/fast_switch3.txt @@ -0,0 +1 @@ +11,4,768,1236,222608,131328,2167332,1,7,4194304,35123929 \ No newline at end of file diff --git a/audio/cheetah/cs35l41/fw/fast_switch4.txt b/audio/cheetah/cs35l41/fw/fast_switch4.txt new file mode 100644 index 0000000..61d8dca --- /dev/null +++ b/audio/cheetah/cs35l41/fw/fast_switch4.txt @@ -0,0 +1 @@ +11,4,768,1236,222608,135424,2167332,1,7,4194304,290834899 \ No newline at end of file diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index b268f0f..7cccf52 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -105,6 +105,12 @@ + + + + + + @@ -635,6 +641,14 @@ + + + + + + + + @@ -643,12 +657,21 @@ - - + + + + + + + + + - + + + @@ -656,6 +679,12 @@ + + + + + + diff --git a/audio/panther/cs35l41/fw/fast_switch1.txt b/audio/panther/cs35l41/fw/fast_switch1.txt new file mode 100644 index 0000000..d6a7551 --- /dev/null +++ b/audio/panther/cs35l41/fw/fast_switch1.txt @@ -0,0 +1 @@ +11,4,768,1236,157072,131072,2167332,1,7,0,849631556 \ No newline at end of file diff --git a/audio/panther/cs35l41/fw/fast_switch2.txt b/audio/panther/cs35l41/fw/fast_switch2.txt new file mode 100644 index 0000000..9ebe3be --- /dev/null +++ b/audio/panther/cs35l41/fw/fast_switch2.txt @@ -0,0 +1 @@ +11,4,768,1236,157072,135168,2167332,1,7,0,568746574 \ No newline at end of file diff --git a/audio/panther/cs35l41/fw/fast_switch3.txt b/audio/panther/cs35l41/fw/fast_switch3.txt new file mode 100644 index 0000000..97006ef --- /dev/null +++ b/audio/panther/cs35l41/fw/fast_switch3.txt @@ -0,0 +1 @@ +11,4,768,1236,157072,131328,2167332,1,7,4194304,356488729 \ No newline at end of file diff --git a/audio/panther/cs35l41/fw/fast_switch4.txt b/audio/panther/cs35l41/fw/fast_switch4.txt new file mode 100644 index 0000000..2bbc374 --- /dev/null +++ b/audio/panther/cs35l41/fw/fast_switch4.txt @@ -0,0 +1 @@ +11,4,768,1236,157072,135424,2167332,1,7,4194304,108899603 \ No newline at end of file From 33ecc54bf512cb10a84a645acc17e498ab78b83f Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Wed, 6 Apr 2022 16:24:29 +0800 Subject: [PATCH 5/6] audio: update speaker protection bin files Change list: 1.Enable Top/Bot speaker FIR module on voice call Bug: 198765357 Test: Builds Change-Id: Ia51415f64b429cd79afaee709a8b16bc33d1edcc Signed-off-by: Robert Lee --- .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin | Bin 5200 -> 5204 bytes .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 5216 -> 5204 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/cheetah/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/cheetah/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin index ed74bad79b7ed6c64f1a2bbe147d4add8970489a..8d6fb23681d897563189f91f60da954d785c712b 100644 GIT binary patch delta 841 zcmah{{ZGsR9Dcsv??uU0=7@-7aZ2;OJDHcw+7d&EdCS{H%QdT|mmk8;nIE*pma++p zHWtlcEVIc=jCm_lv6C$&xm2#Mdrj%?@%0z@<+IP{v*-Cd`|Np|HJ>zRqlMJ+IkEHf zy2L%QQVeVI@{BoIhGea5NZGzsdsu5YkXK}o^|EgD+AZbT3xg+zLpl*7#ont*70j=I zZwPRhUJHy6cL{~`($k1f5N=A5bkiG!jifd3gFbr4*aCdu1A6Fr#wnx))e6SB6;H{i zKtCO{m+~b2WuqqcvFAA(Ief|0$M5X4GJ$sXTG-CE9h|`*bGskX{E0pI(=Z1z6S$Co)0{ap*SUDJ~FX)6Kb$|F!dCcBCHzuSad98J^%3MC~9aPs_jbPYrc$QCEH5u z4|$)h?Oe~M*}q+w&OjK8k$x#F4U>`HjSl4MZp?-b8_KbhzA{Y__HkT14q=7IXy-0? zZwGGq8!GA@q7W22%dZLaRaE%?c*WIfp(ikKp)>|}c_fE%$W%Kltc7{iFYacSSTw@x zY<+}WHe6jEff;m^;1L}b)l|Bn&ct&%uO(dJ7mi+skz-3Ip5g#)Ie3fkBHS1j)}rm9lqjM?1m;{zeY6-^2oh_J)+RpZ(FWBB<4@dZTzYV8TWSR`K^g zLII*6_=E;Uz*&IrP+b&Ll-{ux=@1@^GZnl`1DV|Cze6Y8X^bb$LZ!lWB%=g~Q>Af; z4lAxfbzl6Y2oLQ?JXCw7Bn9t$0vAL{>QHjydaw+UkhY24%HZyU3DQ?dtsL^o5Ft3l zcmG270zp6*>Xpxi^HB=nIHKvRt5UU1ob%tn*PWka6eR^#p;ia!wX!Uqo336Erd_Pp O>6Ym9vNmRd3HS@ieXjoi delta 853 zcma)5|4+;T7=G>|r`oytR7~M~biVD_ohUI&jA}8WWsIFrSEP%@;>I;I-)0o8jm_3} z3%_8gAEJnrtYs+C(e#Zoec7p0=hM|aKK=uHe|Wcd@AGW$^FB}O;`fUSwTgtI`8v_K z!eENGSj^e!rj15}X;W&7G1p)^V97HX4TjZuCvwt@vh}J!jmoD$RA|dfw&#I_W!92v zjFSDQy*LMZCVt~;gnbf;9owONH&IgI6_lHbyNpU--VXO}M?wBg4bx!DTr11fpY8t6 zI{vJphyed)5i0mZ(*WU=s*Wv~8V4;Kmxt{_D667jWq(=sS?D=1opJD;g{ka-x&aaV z5;wOHpyM3gayYKff^fR_$UJ^2lW*yQM#o-ux6WQf4}ZOs$=n0BVHE=9kMlT$)`>3m zBlI2*bMWKLos{_J7?L=i=-vzgh-U_bi{3jNLx_d*C`E<*k&#j*c9Yknd<4;}la&)5 zc?G!zCozQMWkDq*J=c&!c6g>i;N)dmAzYvMx2h3hn85K!O)MuU`M^Udbj%Jlr8MTk zziOnOqws5BBS#8-hh@_Z>gCG@>!F3BqI8NQ;6EH+aVyZQ440E3>itAH0$Dj`Q`RAI fjaD?|8;$>RaWg!4i8?AWDmvO2vvQT_cLw+iDe$!a diff --git a/audio/cheetah/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/cheetah/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index 75ebae38eab5bfe7423aac85c7a1da7087f7d902..e972b876fffb59240ca48d98ccbc5f2cb44c34a5 100644 GIT binary patch delta 874 zcmX|Ae@v4H5Pe@Mf-MLnI$%aeK22#5wa|%(QL`~oqmrN!6H|Z0h^&FoDMi->)@n2m z7JrQxB5~PfjXz>g5jBlQ5=5ifRH`r;5TIbI5Ev^JNn6|R?ISU}3|4%w=*ovnE-s)9W(x zHf&k4*I0JOtc^+pB5YzrlYO&b9j8w<;(!vW0MqDM=?O!P$SIa_ta0)hLwtXYW(GF- zkMmznn5d^W?5stF^riDySaw0i6xqEdaefn&=)Ib#sW_4&LRM%AL!<=}P1W zc7`8D^B;y{`Iya@n&My;7}Rnx?=O2cz;|@E@-TZh^etj5TaL4tPM;%-PuLU10-n>` z3S{t90adiL{zM5-qH*y>EM+U9E4gF3uV~QAby0nFxG)DQGWqy27Z~b1;Yqm z#38J=UG2bg9KMHoScA%_I4nj&yU>S++1W0nBLc(y72DOxb>p(sr{YVy!HJy{wq z`+wiVM5+C#kR&*sCS`IX>#~I!OwIgQBpnF-wn*qwT$ld*D_o+eX+*VDvCmN=X~U;# z6*i&zh{lc);aQvXM#{B&%t95c2Y;2SuzIu4!+b6{i&9*F_4OcYq477jFcYUNygo5$$21+225`~@;0el9Qi z1E(&@_YS5Zh2iFl%55=otYozO3?bS7x4gR81d}i={HRaDZ?-2CE0W}Y5YttnxuVQi jR=nG|Ps~XXb>C+!uM=md$7kp>^;s*jWPqrul3V=;ZN9Qu delta 869 zcmX|A3rtf76g{u6<+UpXT3W?lL=+|4bd-*bHuD#eEeg>XOiExeZh$%mmS2LKSmOL7 zCKwRHG!rG8zo2dvlw!ddqXRM>xJ)q{MpQ&VfsMjK4V2@)DNCF&JHH@1V^eb0=0bCH>?XS$ zqaBuymwd4;TW&3LL`fzTjy2vz6C7c#yxXzt$=9dF)K)1!%IB%6Hl^HS<^%}-A8$kjfN{C&+%qIv-opSdmV4{wv&23 zoj!JqFA>^ED?T}r>B4&`1dhPDOW~f5Gib2j09x17=c5aMybB*Zd-p}765rUc90~VU z_adAR_d@|`=i~D*B0Qb9U|X>Kf?W1E5eIX9%0(1oQ6K!waa$^oOLq-72q|%e0YVn4 z68#P&O)C4CjNKuE$hE2V8Bo%BV+D#h`orjbMDlqK|3qY0XA%1_)5LGtpQR1v|NM6k z+W6@3ND0*J-arTRoBLnN7)2>Rq<4*IlUMDH#2BAg27i$;|J~#r2+M}T4a2? zKp5(=03mkcX#^m6p%q&p9oHX{iBv8~Fny`siy-KmFcTrE24M;`AEzNc)4C9ffNNL^ z-7 Date: Thu, 7 Apr 2022 20:20:31 -0700 Subject: [PATCH 6/6] display: Set ro.surface_flinger.ignore_hdr_camera_layers This property prevents display high brightness mode from being triggered due to HDR layers produced by camera. Bug: 218728138 Change-Id: I772d6c73e877661a2296a448725e9a0ca247ed07 --- device-cheetah.mk | 1 + device-panther.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index cefd34e..dbe924c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -39,6 +39,7 @@ $(call soong_config_set,lyric,tuning_product,cheetah) $(call soong_config_set,google3a_config,target_device,cheetah) PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # Init files PRODUCT_COPY_FILES += \ diff --git a/device-panther.mk b/device-panther.mk index 075f5ea..979ef35 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -175,6 +175,7 @@ endif # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # WiFi Overlay PRODUCT_PACKAGES += \