Snap for 12385180 from 9bfc8d46b9
to 25D4-release
Change-Id: Ibdbdd85c0c9e35e49e2f54bc781ec3d05a43f84d
This commit is contained in:
commit
e302492ac5
3 changed files with 37 additions and 14 deletions
|
@ -15,6 +15,8 @@
|
|||
#
|
||||
|
||||
SHIPPING_API_LEVEL := 34
|
||||
USES_RADIOEXT_V1_7 = false
|
||||
USES_RADIOEXT_V2_0 = true
|
||||
|
||||
ifdef RELEASE_GOOGLE_TEGU_RADIO_DIR
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_TEGU_RADIO_DIR)
|
||||
|
@ -54,8 +56,7 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
|
|||
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||
include device/google/gs-common/touch/gti/predump_gti.mk
|
||||
include device/google/gs-common/touch/syna/predump_syna20.mk
|
||||
include device/google/gs-common/modem/radio_ext/radio_ext.mk
|
||||
include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
|
||||
include device/google/gs-common/gril/aidl/2.0/gril_aidl.mk
|
||||
include device/google/gs-common/esim/esim.mk
|
||||
|
||||
# go/lyric-soong-variables
|
||||
|
|
|
@ -83,20 +83,31 @@
|
|||
"Hidden": true,
|
||||
"VirtualSensor": true,
|
||||
"Formula": "WEIGHTED_AVG",
|
||||
"Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
|
||||
"Coefficient": [0, 0, -0.155, 0, 0, 0.503, 0, 0.559, 0],
|
||||
"Offset": 2614,
|
||||
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"],
|
||||
"Coefficient": [0.094, 0.14, 0.162, 0.236, 0.282, 0.06, 0.115, 0.015],
|
||||
"Offset": -4114.0,
|
||||
"Multiplier": 0.001
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-CHARGE-SUB-1",
|
||||
"Type": "UNKNOWN",
|
||||
"Hidden": true,
|
||||
"VirtualSensor": true,
|
||||
"Formula": "WEIGHTED_AVG",
|
||||
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"],
|
||||
"Coefficient": [0.106, 0.162, 0.169, 0.24, 0.086, 0.012, 0.189, 0.036],
|
||||
"Offset": -971.0,
|
||||
"Multiplier": 0.001
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"1.0",
|
||||
"Version":"2.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":"charging_therm",
|
||||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0"],
|
||||
"Coefficient":[1.0],
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"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,
|
||||
|
|
|
@ -746,20 +746,31 @@
|
|||
"Hidden": true,
|
||||
"VirtualSensor": true,
|
||||
"Formula": "WEIGHTED_AVG",
|
||||
"Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
|
||||
"Coefficient": [0, 0, -0.155, 0, 0, 0.503, 0, 0.559, 0],
|
||||
"Offset": 2614,
|
||||
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"],
|
||||
"Coefficient": [0.094, 0.14, 0.162, 0.236, 0.282, 0.06, 0.115, 0.015],
|
||||
"Offset": -4114.0,
|
||||
"Multiplier": 0.001
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-CHARGE-SUB-1",
|
||||
"Type": "UNKNOWN",
|
||||
"Hidden": true,
|
||||
"VirtualSensor": true,
|
||||
"Formula": "WEIGHTED_AVG",
|
||||
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"],
|
||||
"Coefficient": [0.106, 0.162, 0.169, 0.24, 0.086, 0.012, 0.189, 0.036],
|
||||
"Offset": -971.0,
|
||||
"Multiplier": 0.001
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"1.0",
|
||||
"Version":"2.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":"charging_therm",
|
||||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0"],
|
||||
"Coefficient":[1.0],
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue