Merge cherrypicks of ['googleplex-android-review.googlesource.com/28252250'] into 24Q3-release.

Change-Id: I1612c65dfffdfa3eb65acf58c6af26815a651288
This commit is contained in:
Android Build Coastguard Worker 2024-07-12 04:03:06 +00:00
commit 91a88bcf76
4 changed files with 60 additions and 62 deletions

View file

@ -681,9 +681,10 @@
"Values": [ "Values": [
"76", "76",
"55", "55",
"38",
"36",
"10", "10",
"47",
"45",
"36",
"30", "30",
"28" "28"
], ],
@ -706,10 +707,9 @@
"Values": [ "Values": [
"59", "59",
"30", "30",
"20",
"2", "2",
"18", "23",
"15" "20"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -730,8 +730,7 @@
"62", "62",
"0", "0",
"20", "20",
"22", "22"
"15"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -1850,7 +1849,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "36" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1862,7 +1861,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1874,7 +1873,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_BIG_SPC_THRESHOLD", "Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2024,7 +2023,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "38" "Value": "45"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2036,7 +2035,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "30"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2216,7 +2215,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2228,7 +2227,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -3321,7 +3320,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "28" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
@ -3333,7 +3332,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",

View file

@ -681,9 +681,10 @@
"Values": [ "Values": [
"76", "76",
"55", "55",
"38",
"36",
"10", "10",
"47",
"45",
"36",
"30", "30",
"28" "28"
], ],
@ -706,10 +707,9 @@
"Values": [ "Values": [
"59", "59",
"30", "30",
"20",
"2", "2",
"18", "23",
"15" "20"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -730,8 +730,7 @@
"62", "62",
"0", "0",
"20", "20",
"22", "22"
"15"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -1850,7 +1849,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "36" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1862,7 +1861,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1874,7 +1873,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_BIG_SPC_THRESHOLD", "Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2024,7 +2023,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "38" "Value": "45"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2036,7 +2035,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "30"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2216,7 +2215,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2228,7 +2227,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -3321,7 +3320,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "28" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
@ -3333,7 +3332,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",

View file

@ -700,9 +700,10 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
"Values": [ "Values": [
"76", "76",
"38",
"36",
"10", "10",
"47",
"45",
"36",
"30", "30",
"0" "0"
], ],
@ -725,10 +726,10 @@
"Values": [ "Values": [
"59", "59",
"50", "50",
"20", "30",
"2", "2",
"18", "23",
"15" "20"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -747,10 +748,10 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold", "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold",
"Values": [ "Values": [
"62", "62",
"50",
"0", "0",
"20", "20",
"22", "22"
"15"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -1768,7 +1769,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "36" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1780,7 +1781,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1792,7 +1793,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_BIG_SPC_THRESHOLD", "Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1906,7 +1907,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "38" "Value": "45"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -1918,7 +1919,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "30"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2062,7 +2063,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2074,7 +2075,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",

View file

@ -681,9 +681,10 @@
"Values": [ "Values": [
"76", "76",
"55", "55",
"38",
"36",
"10", "10",
"47",
"45",
"36",
"30", "30",
"28" "28"
], ],
@ -706,10 +707,9 @@
"Values": [ "Values": [
"59", "59",
"30", "30",
"20",
"2", "2",
"18", "23",
"15" "20"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -730,8 +730,7 @@
"62", "62",
"0", "0",
"20", "20",
"22", "22"
"15"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
@ -1850,7 +1849,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "36" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1862,7 +1861,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -1874,7 +1873,7 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PMU_BIG_SPC_THRESHOLD", "Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "15" "Value": "20"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2024,7 +2023,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "38" "Value": "45"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2036,7 +2035,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "20" "Value": "30"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2216,7 +2215,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2228,7 +2227,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -3321,7 +3320,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_LIT_SPC_THRESHOLD", "Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "28" "Value": "47"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
@ -3333,7 +3332,7 @@
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_MID_SPC_THRESHOLD", "Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0, "Duration": 0,
"Value": "18" "Value": "23"
}, },
{ {
"PowerHint": "CAMERA_PROJECT11", "PowerHint": "CAMERA_PROJECT11",