From 46c049985a6215948396df304c6cba0e8ae031be Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Mon, 23 Dec 2024 06:47:37 +0000 Subject: [PATCH 1/2] Set audio.camerasound.force for JP devices Test: set to JP sku and check No camera sound option Bug: 385658991 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:905adbc926f3df2d608c91667cbd6e7ac85e6ce9) Merged-In: I1594dc20f12e0b9281f6af6d3126fc09f2fa4f79 Change-Id: I1594dc20f12e0b9281f6af6d3126fc09f2fa4f79 --- conf/init.tegu.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/init.tegu.rc b/conf/init.tegu.rc index 4c589bf..8b35f0f 100644 --- a/conf/init.tegu.rc +++ b/conf/init.tegu.rc @@ -67,3 +67,10 @@ 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/devices/virtual/goog_touch_interface/gti.0/screen_protector_mode_enabled 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=G3Y12 + setprop audio.camerasound.force true + From 1259b94bb9115e1fa8fa561ed0019621ee985f8d Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 20 Dec 2024 07:36:21 +0000 Subject: [PATCH 2/2] Revert "thermal: Chargign PID target 39 degC" This reverts commit 581fd1071cfb8b042401ac17bc4ae3462c26f540. Bug: 376365052 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:90b07f352053f92fe13c5f2e944a12dac98e9d8b) Merged-In: Ida0fff6742a241018afe7ae80064f3b373feaaf0 Change-Id: Ida0fff6742a241018afe7ae80064f3b373feaaf0 --- thermal/thermal_info_config_charge_tegu.json | 4 ++-- thermal/thermal_info_config_tegu.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json index b38a39c..1ebf2ad 100644 --- a/thermal/thermal_info_config_charge_tegu.json +++ b/thermal/thermal_info_config_charge_tegu.json @@ -108,8 +108,8 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index eab9ee0..64cfb92 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -873,8 +873,8 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000,