Snap for 7487129 from b7bc85bcfa1b60dd83e407b7b87dcf25e60aed42 to tm-release

Change-Id: Ibb8d371ef9cce1288efa836aa634e373cdc0edcf
This commit is contained in:
Android Build Coastguard Worker 2021-06-24 03:01:29 +00:00
commit 0982a8eacc
6 changed files with 38 additions and 61 deletions

View file

@ -72,6 +72,7 @@ PRODUCT_COPY_FILES += \
# Display Config # Display Config
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/raviole/oriole/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \
device/google/raviole/oriole/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb device/google/raviole/oriole/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
# NFC # NFC

Binary file not shown.

View file

@ -35,7 +35,7 @@
<!-- Default screen brightness setting <!-- Default screen brightness setting
Must be in the range specified by minimum and maximum. --> Must be in the range specified by minimum and maximum. -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item> <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17429718</item>
<!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
this value to 0 so it has no effect. --> this value to 0 so it has no effect. -->

View file

@ -71,7 +71,7 @@
<!-- Default screen brightness setting <!-- Default screen brightness setting
Must be in the range specified by minimum and maximum. --> Must be in the range specified by minimum and maximum. -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item> <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17429718</item>
<!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
this value to 0 so it has no effect. --> this value to 0 so it has no effect. -->

View file

@ -341,6 +341,10 @@
}, },
{ {
"CdevRequest": "dc_icl", "CdevRequest": "dc_icl",
"LimitInfo": [0, 1, 2, 3, 3, 3, 3]
},
{
"CdevRequest": "wlc_fcc",
"LimitInfo": [0, 1, 2, 4, 4, 4, 4] "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
} }
] ]
@ -543,26 +547,6 @@
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 7, 7, 10, 10] "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-0",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "thermal-cpufreq-1",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "fcc",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "dc_icl",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
} }
] ]
}, },
@ -794,6 +778,10 @@
{ {
"Name":"dc_icl", "Name":"dc_icl",
"Type":"BATTERY" "Type":"BATTERY"
},
{
"Name":"wlc_fcc",
"Type":"BATTERY"
} }
] ]
} }

View file

@ -138,19 +138,19 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-NEUTRAL-DISP", "Name":"VIRTUAL-NEUTRAL-QI",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":[
"neutral_therm", "neutral_therm",
"disp_therm" "qi_therm"
], ],
"Coefficient":[ "Coefficient":[
"0.55", "0.6",
"0.45" "0.4"
], ],
"Offset":1000, "Offset":-3000,
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
"NAN", "NAN",
@ -216,19 +216,19 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-QI-BATT", "Name":"VIRTUAL-QI-DISP",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":[
"qi_therm", "qi_therm",
"battery" "disp_therm"
], ],
"Coefficient":[ "Coefficient":[
"0.5", "0.25",
"0.5" "0.75"
], ],
"Offset":-4000, "Offset":1000,
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
"NAN", "NAN",
@ -248,10 +248,10 @@
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-NEUTRAL-DISP", "VIRTUAL-NEUTRAL-QI",
"VIRTUAL-USB2-BATT", "VIRTUAL-USB2-BATT",
"VIRTUAL-GNSS-BATT", "VIRTUAL-GNSS-BATT",
"VIRTUAL-QI-BATT" "VIRTUAL-QI-DISP"
], ],
"Coefficient":[ "Coefficient":[
"1.0", "1.0",
@ -261,12 +261,12 @@
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
"39.0", "39",
"43.0", "43",
"45.0", "45",
"47.0", "46.5",
"52.0", "52.0",
"56.0" "55.0"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -341,6 +341,10 @@
}, },
{ {
"CdevRequest": "dc_icl", "CdevRequest": "dc_icl",
"LimitInfo": [0, 1, 2, 3, 3, 3, 3]
},
{
"CdevRequest": "wlc_fcc",
"LimitInfo": [0, 1, 2, 4, 4, 4, 4] "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
} }
] ]
@ -352,10 +356,10 @@
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-NEUTRAL-DISP", "VIRTUAL-NEUTRAL-QI",
"VIRTUAL-USB2-BATT", "VIRTUAL-USB2-BATT",
"VIRTUAL-GNSS-BATT", "VIRTUAL-GNSS-BATT",
"VIRTUAL-QI-BATT" "VIRTUAL-QI-DISP"
], ],
"Coefficient":[ "Coefficient":[
"1.0", "1.0",
@ -543,26 +547,6 @@
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 7, 7, 10, 10] "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-0",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "thermal-cpufreq-1",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "fcc",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
},
{
"CdevRequest": "dc_icl",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
} }
] ]
}, },
@ -794,6 +778,10 @@
{ {
"Name":"dc_icl", "Name":"dc_icl",
"Type":"BATTERY" "Type":"BATTERY"
},
{
"Name":"wlc_fcc",
"Type":"BATTERY"
} }
] ]
} }