Merge cherrypicks of ['googleplex-android-review.googlesource.com/31063493', 'googleplex-android-review.googlesource.com/31003340'] into 25D4-release.

Change-Id: I2945640e9e9b3aae27522c76dbc5c6f33d47b5bc
This commit is contained in:
Android Build Coastguard Worker 2024-12-23 03:34:55 -08:00
commit 493c1801ad
3 changed files with 11 additions and 4 deletions

View file

@ -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

View file

@ -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,

View file

@ -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,