Merge cherrypicks of ['googleplex-android-review.googlesource.com/24116684', 'googleplex-android-review.googlesource.com/24116711'] into udc-release.

Change-Id: I3ade7f4303edfca833138fddffdb627d3b9f31ae
This commit is contained in:
Android Build Coastguard Worker 2023-07-19 03:06:23 +00:00
commit 659d62f018
4 changed files with 25 additions and 21 deletions

View file

@ -106,6 +106,10 @@ on property:vendor.mfgapi.touchpanel.permission=1
on property:persist.device_config.vendor_system_native_boot.thermal_proactive_skin=1 on property:persist.device_config.vendor_system_native_boot.thermal_proactive_skin=1
setprop vendor.thermal.config "thermal_info_config_proactive_skin.json" setprop vendor.thermal.config "thermal_info_config_proactive_skin.json"
on property:vendor.thermal.link_ready=1
write /dev/thermal/tz-by-name/skin_therm/trip_point_1_temp 61000
write /dev/thermal/tz-by-name/skin_therm/trip_point_2_temp 63000
# Bluetooth # Bluetooth
on post-fs-data on post-fs-data
chown bluetooth system /proc/bluetooth/timesync chown bluetooth system /proc/bluetooth/timesync

View file

@ -204,9 +204,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

View file

@ -210,9 +210,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -238,7 +238,7 @@
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5", "Version":"6.2",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
@ -270,7 +270,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
@ -285,7 +285,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -301,7 +301,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -362,7 +362,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -427,7 +427,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,

View file

@ -210,9 +210,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -238,7 +238,7 @@
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5", "Version":"6.2",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
@ -270,7 +270,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
@ -285,7 +285,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -301,7 +301,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -362,7 +362,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -427,7 +427,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,