Snap for 8485840 from f7c1f82f16 to udc-release

Change-Id: I5859cd898110d669ab550b58a5addb392a674b4f
This commit is contained in:
Android Build Coastguard Worker 2022-04-22 03:03:14 +00:00
commit 0f46939ca6
10 changed files with 170 additions and 187 deletions

View file

@ -47,8 +47,6 @@
<item>0</item> <!-- 4: SUN -->
</integer-array>
<bool name="config_roundedCornerMultipleRadius">true</bool>
<!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
M 662,72

View file

@ -53,8 +53,6 @@
-->
<string name="config_rounded_mask" translatable="false">M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71</string>
<bool name="config_roundedCornerMultipleRadius">true</bool>
<!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
M 494,67

View file

@ -237,6 +237,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -1248,6 +1257,12 @@
"Type": "MaskHint",
"Value": "BOOST_120HZ"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "TAUClampBoost",

View file

@ -138,6 +138,7 @@
"553",
"158",
"108",
"43",
"1",
"157",
"53"
@ -236,6 +237,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -1247,6 +1257,12 @@
"Type": "MaskHint",
"Value": "BOOST_120HZ"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "TAUClampBoost",

View file

@ -194,6 +194,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -336,6 +345,12 @@
"Type": "MaskHint",
"Value": "INTERACTION_120"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "EndHint",

View file

@ -236,6 +236,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -1231,6 +1240,12 @@
"Type": "MaskHint",
"Value": "BOOST_90HZ"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "TAUClampBoost",

View file

@ -137,6 +137,7 @@
"Values": [
"553",
"108",
"43",
"1",
"107",
"53"
@ -235,6 +236,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -1230,6 +1240,12 @@
"Type": "MaskHint",
"Value": "BOOST_90HZ"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "TAUClampBoost",

View file

@ -194,6 +194,15 @@
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap",
@ -336,6 +345,12 @@
"Type": "MaskHint",
"Value": "INTERACTION_120"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "EndHint",

View file

@ -83,9 +83,9 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "usb_pwr_therm2"],
"Coefficient":[1.208, -0.208],
"Offset":-874,
"Combination":["quiet_therm","usb_pwr_therm2"],
"Coefficient":[1.1, -0.1],
"Offset":-900,
"Multiplier":0.001
},
{
@ -95,29 +95,41 @@
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm"],
"Coefficient":[0.6, 0.4],
"Offset":-500,
"Coefficient":[0.378, 0.622],
"Offset":-453,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEUTRAL-USB",
"Name":"VIRTUAL-QI-QUIET",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm"],
"Coefficient":[0.460, 0.540],
"Offset":-3200,
"Combination":["qi_therm","quiet_therm"],
"Coefficient":[0.3, 0.7],
"Offset":-500,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QI-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["qi_therm", "disp_therm"],
"Coefficient":[0.257, 0.743],
"Offset":-268,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
"Version":"0.5",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"],
"Coefficient":[1.0, 1.0, 1.0],
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
@ -142,8 +154,8 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"],
"Coefficient":[1.0, 1.0, 1.0],
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
@ -202,7 +214,7 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"],
"Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
"Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@ -246,8 +258,8 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"],
"Coefficient":["1.0", "1.0", "1.0"],
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
@ -260,24 +272,8 @@
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"usb_pwr_therm",
"usb_pwr_therm2"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{
@ -285,24 +281,8 @@
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"usb_pwr_therm",
"neutral_therm"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Combination":["usb_pwr_therm", "neutral_therm"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{
@ -311,25 +291,9 @@
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":[
"usb_pwr_therm",
"USB-MINUS-USB2",
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"42000",
"4000",
"7000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN",
"NAN"
],
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"Coefficient":[42000, 4000,7000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
@ -347,25 +311,9 @@
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":[
"usb_pwr_therm",
"USB-MINUS-USB2",
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"47000",
"4500",
"8000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN"
],
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"Coefficient":[47000, 4500, 8000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,

View file

@ -56,14 +56,14 @@
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-QUIET-USB",
"Name":"VIRTUAL-GNSS-QUIET",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.973, 0.027],
"Offset":-2200,
"Combination":["gnss_tcxo_therm", "quiet_therm"],
"Coefficient":[1.3, -0.3],
"Offset":-1800,
"Multiplier":0.001
},
{
@ -84,8 +84,8 @@
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["gnss_tcxo_therm", "disp_therm"],
"Coefficient":[0.550, 0.450],
"Offset":3000,
"Coefficient":[0.9, 0.1],
"Offset":-700,
"Multiplier":0.001
},
{
@ -95,29 +95,40 @@
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm"],
"Coefficient":[0.6, 0.4],
"Offset":-400,
"Coefficient":[0.3, 0.7],
"Offset":-500,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEUTRAL-USB",
"Name":"VIRTUAL-QI-QUIET",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm"],
"Coefficient":[0.6, 0.4],
"Offset":-4000,
"Combination":["qi_therm", "quiet_therm"],
"Coefficient":[0.3, 0.7],
"Offset":-1400,
},
{
"Name":"VIRTUAL-QI-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["qi_therm","disp_therm"],
"Coefficient":[0.2, 0.8],
"Offset":-900,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
"Version":"0.5",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"],
"Coefficient":[1.0, 1.0, 1.0],
"Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
@ -142,8 +153,8 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"],
"Coefficient":[1.0, 1.0, 1.0],
"Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
@ -202,7 +213,7 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"],
"Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
"Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@ -246,8 +257,8 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"],
"Coefficient":[1.0, 1.0, 1.0],
"Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
@ -260,24 +271,8 @@
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"usb_pwr_therm",
"usb_pwr_therm2"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{
@ -285,24 +280,8 @@
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"usb_pwr_therm",
"neutral_therm"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Combination":["usb_pwr_therm", "neutral_therm"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{
@ -311,25 +290,9 @@
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":[
"usb_pwr_therm",
"USB-MINUS-USB2",
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"40000",
"1500",
"3000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN",
"NAN"
],
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"Coefficient":[40000, 1500, 3000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
@ -347,25 +310,9 @@
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":[
"usb_pwr_therm",
"USB-MINUS-USB2",
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"42000",
"2000",
"4000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN"
],
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"Coefficient":[42000, 2000, 4000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,