Snap for 12742097 from 5c2e9c6e90 to 25Q1-release

Change-Id: Iad6ec687ccfbcd07488dbcc693d862c0e017a02b
This commit is contained in:
Android Build Coastguard Worker 2024-12-04 00:02:37 +00:00
commit 288924ac76
6 changed files with 119 additions and 209 deletions

View file

@ -174,9 +174,6 @@
<integer name="config_stableDeviceDisplayWidth">1280</integer>
<integer name="config_stableDeviceDisplayHeight">2856</integer>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
<!-- Align to camera cutout's height. -->
<dimen name="status_bar_height_portrait">68dp</dimen>
<!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value

View file

@ -174,9 +174,6 @@
<integer name="config_stableDeviceDisplayWidth">1344</integer>
<integer name="config_stableDeviceDisplayHeight">2992</integer>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
<!-- Align to camera cutout's height. -->
<dimen name="status_bar_height_portrait">66dp</dimen>
<!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value

View file

@ -981,6 +981,16 @@
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "SYSTEM_UI_ADPF_PROFILES",
"Path": "<AdpfConfig>:SYSTEM_UI",
"Values": [
"SYSTEM_UI_PROFILE"
],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Event"
}
],
"Actions": [
@ -3810,79 +3820,42 @@
"GpuCapacityBoostMax": 25000
},
{
"Name": "UiHighBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"Name": "SYSTEM_UI_PROFILE",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 0.5,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,
"PID_I_Low": -30,
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 730,
"UclampMin_LoadReset": 730,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"ReportingRateLimitNs": 166666660,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostModerateJankThreshold": 2,
"HBoostOffMaxAvgDurRatio": 4.0,
"HBoostSevereJankPidPu": 0.3,
"HBoostSevereJankThreshold": 8,
"HBoostUclampMinCeilingRange": [480, 722],
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}
]
}

View file

@ -981,6 +981,16 @@
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "SYSTEM_UI_ADPF_PROFILES",
"Path": "<AdpfConfig>:SYSTEM_UI",
"Values": [
"SYSTEM_UI_PROFILE"
],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Event"
}
],
"Actions": [
@ -3810,79 +3820,42 @@
"GpuCapacityBoostMax": 25000
},
{
"Name": "UiHighBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"Name": "SYSTEM_UI_PROFILE",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 0.5,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,
"PID_I_Low": -30,
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 730,
"UclampMin_LoadReset": 730,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"ReportingRateLimitNs": 166666660,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"GpuBoost": false
"HeuristicBoost_On": true,
"HBoostModerateJankThreshold": 2,
"HBoostOffMaxAvgDurRatio": 4.0,
"HBoostSevereJankPidPu": 0.3,
"HBoostSevereJankThreshold": 8,
"HBoostUclampMinCeilingRange": [480, 722],
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}
]
}

View file

@ -981,6 +981,16 @@
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "SYSTEM_UI_ADPF_PROFILES",
"Path": "<AdpfConfig>:SYSTEM_UI",
"Values": [
"SYSTEM_UI_PROFILE"
],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Event"
}
],
"Actions": [
@ -3810,79 +3820,42 @@
"GpuCapacityBoostMax": 25000
},
{
"Name": "UiHighBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"Name": "SYSTEM_UI_PROFILE",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 0.5,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,
"PID_I_Low": -30,
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 730,
"UclampMin_LoadReset": 730,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"ReportingRateLimitNs": 166666660,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostModerateJankThreshold": 2,
"HBoostOffMaxAvgDurRatio": 4.0,
"HBoostSevereJankPidPu": 0.3,
"HBoostSevereJankThreshold": 8,
"HBoostUclampMinCeilingRange": [480, 722],
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}
]
}

View file

@ -174,9 +174,6 @@
<integer name="config_stableDeviceDisplayWidth">1080</integer>
<integer name="config_stableDeviceDisplayHeight">2424</integer>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
<!-- Align to camera cutout's height. -->
<dimen name="status_bar_height_portrait">66dp</dimen>
<!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value