Merge "thermal: Clean up stats config" into 24D1-dev am: 8ac4d80a9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27545159 Change-Id: Idc2ef0f9e6351fc0f9e207594e1d3d57f0cf3bcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
b74129df87
6 changed files with 14 additions and 328 deletions
|
@ -1185,41 +1185,9 @@
|
|||
"Sensors": {
|
||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-3",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-4",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-5",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-6",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
|
@ -1227,11 +1195,11 @@
|
|||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
|
|
|
@ -1033,79 +1033,5 @@
|
|||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":5
|
||||
}
|
||||
],
|
||||
"Stats": {
|
||||
"Sensors": {
|
||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-0.5",
|
||||
"Thresholds": [
|
||||
-4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0,
|
||||
500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-1",
|
||||
"Thresholds": [
|
||||
-13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000,
|
||||
-4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000
|
||||
]
|
||||
}
|
||||
],
|
||||
"Abnormality": {
|
||||
"Outlier": {
|
||||
"Configs": [
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL"],
|
||||
"TempRange": [0.0, 55.0]
|
||||
},
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
|
||||
"TempRange": [-7000, 7000]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"CoolingDevices": {
|
||||
"RecordVotePerSensor": {
|
||||
"DefaultThresholdEnableAll": true
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -317,7 +317,7 @@
|
|||
"PollingDelay": 300000,
|
||||
"PassiveDelay": 7000
|
||||
},
|
||||
{
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
"Type": "SKIN",
|
||||
"Version": "6.1",
|
||||
|
@ -1208,37 +1208,9 @@
|
|||
"Sensors": {
|
||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-3",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-4",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-5",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
|
@ -1246,11 +1218,11 @@
|
|||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
|
|
|
@ -1020,87 +1020,5 @@
|
|||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":5
|
||||
}
|
||||
],
|
||||
"Stats": {
|
||||
"Sensors": {
|
||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-3",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-4",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-0.5",
|
||||
"Thresholds": [
|
||||
-4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0,
|
||||
500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-1",
|
||||
"Thresholds": [
|
||||
-13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000,
|
||||
-4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000
|
||||
]
|
||||
}
|
||||
],
|
||||
"Abnormality": {
|
||||
"Outlier": {
|
||||
"Configs": [
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL"],
|
||||
"TempRange": [0.0, 55.0]
|
||||
},
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
|
||||
"TempRange": [-7000, 7000]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"CoolingDevices": {
|
||||
"RecordVotePerSensor": {
|
||||
"DefaultThresholdEnableAll": true
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -816,7 +816,7 @@
|
|||
"Offset": -555.0,
|
||||
"Multiplier": 0.001
|
||||
},
|
||||
{
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-FRONT",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"4.1",
|
||||
|
@ -1144,35 +1144,7 @@
|
|||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-3",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-4",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-5",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-6",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
|
@ -1180,11 +1152,11 @@
|
|||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
|
|
|
@ -1036,75 +1036,5 @@
|
|||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":5
|
||||
}
|
||||
],
|
||||
"Stats": {
|
||||
"Sensors": {
|
||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||
"RecordWithThreshold": [
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-0",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-1",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-SUB-2",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-LEGACY",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL",
|
||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-0.5",
|
||||
"Thresholds": [
|
||||
-4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0,
|
||||
500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
|
||||
"LoggingName": "MODEL-LEGACY-1",
|
||||
"Thresholds": [
|
||||
-13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000,
|
||||
-4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000
|
||||
]
|
||||
}
|
||||
],
|
||||
"Abnormality": {
|
||||
"Outlier": {
|
||||
"Configs": [
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL"],
|
||||
"TempRange": [0.0, 55.0]
|
||||
},
|
||||
{
|
||||
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
|
||||
"TempRange": [-7000, 7000]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"CoolingDevices": {
|
||||
"RecordVotePerSensor": {
|
||||
"DefaultThresholdEnableAll": true
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue