Merge Android 13 QPR2

Bug: 273316506
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ida9fbc6ddbc729103197f8f352c5251acaaeac3f
This commit is contained in:
Xin Li 2023-03-13 23:09:07 -07:00
commit 69ed58ce78
10 changed files with 165 additions and 47 deletions

View file

@ -224,6 +224,8 @@
<be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_CAMCORDER_MIC_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/> <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/> <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/> <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>

View file

@ -1,7 +1,7 @@
#PLATFORM_NAME gChip #PLATFORM_NAME gChip
#EXPORT_FLAG HANDSFREE #EXPORT_FLAG HANDSFREE
#SINGLE_API_VER 1.1.6 #SINGLE_API_VER 1.1.6
#SAVE_TIME 2022-03-29 15:50:02 #SAVE_TIME 2022-07-21 12:24:17
#CASE_NAME HANDSFREE-HANDSFREE-RESERVE1-FB #CASE_NAME HANDSFREE-HANDSFREE-RESERVE1-FB
#PARAM_MODE FULL #PARAM_MODE FULL
@ -5467,10 +5467,10 @@
194 0x0000 //TX_NORMENERTH 194 0x0000 //TX_NORMENERTH
195 0x0000 //TX_NORMENERHIGHTH 195 0x0000 //TX_NORMENERHIGHTH
196 0x0000 //TX_NORMENERHIGHTHL 196 0x0000 //TX_NORMENERHIGHTHL
197 0x7FF0 //TX_DTD_THR1_0 197 0x7210 //TX_DTD_THR1_0
198 0x7FF0 //TX_DTD_THR1_1 198 0x7D10 //TX_DTD_THR1_1
199 0x7FF0 //TX_DTD_THR1_2 199 0x7FF0 //TX_DTD_THR1_2
200 0x7FF0 //TX_DTD_THR1_3 200 0x7F00 //TX_DTD_THR1_3
201 0x7FF0 //TX_DTD_THR1_4 201 0x7FF0 //TX_DTD_THR1_4
202 0x7FF0 //TX_DTD_THR1_5 202 0x7FF0 //TX_DTD_THR1_5
203 0x7FF0 //TX_DTD_THR1_6 203 0x7FF0 //TX_DTD_THR1_6
@ -5553,17 +5553,17 @@
280 0x1000 //TX_B_POST_FLT_1 280 0x1000 //TX_B_POST_FLT_1
281 0x0010 //TX_NS_LVL_CTRL_0 281 0x0010 //TX_NS_LVL_CTRL_0
282 0x0012 //TX_NS_LVL_CTRL_1 282 0x0012 //TX_NS_LVL_CTRL_1
283 0x0012 //TX_NS_LVL_CTRL_2 283 0x0010 //TX_NS_LVL_CTRL_2
284 0x0015 //TX_NS_LVL_CTRL_3 284 0x0015 //TX_NS_LVL_CTRL_3
285 0x0012 //TX_NS_LVL_CTRL_4 285 0x0010 //TX_NS_LVL_CTRL_4
286 0x0012 //TX_NS_LVL_CTRL_5 286 0x0012 //TX_NS_LVL_CTRL_5
287 0x0011 //TX_NS_LVL_CTRL_6 287 0x0011 //TX_NS_LVL_CTRL_6
288 0x0011 //TX_NS_LVL_CTRL_7 288 0x0011 //TX_NS_LVL_CTRL_7
289 0x000F //TX_MIN_GAIN_S_0 289 0x000F //TX_MIN_GAIN_S_0
290 0x000F //TX_MIN_GAIN_S_1 290 0x000F //TX_MIN_GAIN_S_1
291 0x000D //TX_MIN_GAIN_S_2 291 0x0008 //TX_MIN_GAIN_S_2
292 0x000F //TX_MIN_GAIN_S_3 292 0x000F //TX_MIN_GAIN_S_3
293 0x000F //TX_MIN_GAIN_S_4 293 0x0008 //TX_MIN_GAIN_S_4
294 0x000F //TX_MIN_GAIN_S_5 294 0x000F //TX_MIN_GAIN_S_5
295 0x0010 //TX_MIN_GAIN_S_6 295 0x0010 //TX_MIN_GAIN_S_6
296 0x000F //TX_MIN_GAIN_S_7 296 0x000F //TX_MIN_GAIN_S_7
@ -5572,9 +5572,9 @@
299 0x0000 //TX_NMOS_SUP_MENSA 299 0x0000 //TX_NMOS_SUP_MENSA
300 0x7FFF //TX_SNRI_SUP_0 300 0x7FFF //TX_SNRI_SUP_0
301 0x4000 //TX_SNRI_SUP_1 301 0x4000 //TX_SNRI_SUP_1
302 0x3000 //TX_SNRI_SUP_2 302 0x6000 //TX_SNRI_SUP_2
303 0x4000 //TX_SNRI_SUP_3 303 0x4000 //TX_SNRI_SUP_3
304 0x2400 //TX_SNRI_SUP_4 304 0x6000 //TX_SNRI_SUP_4
305 0x4000 //TX_SNRI_SUP_5 305 0x4000 //TX_SNRI_SUP_5
306 0x4000 //TX_SNRI_SUP_6 306 0x4000 //TX_SNRI_SUP_6
307 0x7FFF //TX_SNRI_SUP_7 307 0x7FFF //TX_SNRI_SUP_7
@ -5596,7 +5596,7 @@
323 0x1000 //TX_B_POST_FILT_1 323 0x1000 //TX_B_POST_FILT_1
324 0x1000 //TX_B_POST_FILT_2 324 0x1000 //TX_B_POST_FILT_2
325 0x1000 //TX_B_POST_FILT_3 325 0x1000 //TX_B_POST_FILT_3
326 0x5000 //TX_B_POST_FILT_4 326 0x4000 //TX_B_POST_FILT_4
327 0x3000 //TX_B_POST_FILT_5 327 0x3000 //TX_B_POST_FILT_5
328 0x1000 //TX_B_POST_FILT_6 328 0x1000 //TX_B_POST_FILT_6
329 0x2000 //TX_B_POST_FILT_7 329 0x2000 //TX_B_POST_FILT_7
@ -5613,7 +5613,7 @@
340 0x7900 //TX_LAMBDA_PFILT_S_1 340 0x7900 //TX_LAMBDA_PFILT_S_1
341 0x7C00 //TX_LAMBDA_PFILT_S_2 341 0x7C00 //TX_LAMBDA_PFILT_S_2
342 0x7900 //TX_LAMBDA_PFILT_S_3 342 0x7900 //TX_LAMBDA_PFILT_S_3
343 0x7000 //TX_LAMBDA_PFILT_S_4 343 0x7C00 //TX_LAMBDA_PFILT_S_4
344 0x7D00 //TX_LAMBDA_PFILT_S_5 344 0x7D00 //TX_LAMBDA_PFILT_S_5
345 0x7D00 //TX_LAMBDA_PFILT_S_6 345 0x7D00 //TX_LAMBDA_PFILT_S_6
346 0x7D00 //TX_LAMBDA_PFILT_S_7 346 0x7D00 //TX_LAMBDA_PFILT_S_7

View file

@ -73,7 +73,7 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 480,0 M 480,0
h 145 h 145
v 118 v 132
h -145 h -145
Z Z
@left @left

View file

@ -30,7 +30,7 @@
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
--> -->
<dimen name="status_bar_height_default">28dp</dimen> <dimen name="status_bar_height_default">28dp</dimen>
<dimen name="status_bar_height_portrait">118px</dimen> <dimen name="status_bar_height_portrait">132px</dimen>
<dimen name="status_bar_height_landscape">28dp</dimen> <dimen name="status_bar_height_landscape">28dp</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->

View file

@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=22 ro.vendor.build.svn=25
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -35,6 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,6 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -168,16 +168,7 @@
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
"Name": "UClampThreshold", "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/uclamp_threshold",
"Values": [
"0",
"8"
],
"ResetOnInit": true
},
{
"Name": "ReduceRreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle", "Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [ "Values": [
"0", "0",
@ -198,6 +189,7 @@
"Name": "CDCpuset", "Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus", "Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -207,6 +199,7 @@
"Name": "CDHighCpusetCpus", "Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [ "Values": [
"0-3",
"6-7", "6-7",
"0-7" "0-7"
], ],
@ -216,6 +209,7 @@
"Name": "CDMidCpusetCpus", "Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [ "Values": [
"0-3",
"4-5", "4-5",
"0-7" "0-7"
], ],
@ -225,6 +219,7 @@
"Name": "CDMidHighCpusetCpus", "Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -295,6 +290,16 @@
], ],
"Type": "Property" "Type": "Property"
}, },
{
"Name": "PowerHALCameraRunning",
"Path": "vendor.powerhal.camerarunning",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{ {
"Name": "INTCAMFreq", "Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@ -479,14 +484,32 @@
], ],
"Actions": [ "Actions": [
{ {
"PowerHint": "LAUNCH", "PowerHint": "CDCPUSET_RESTRICTED",
"Node": "UClampThreshold", "Node": "CDCpuset",
"Duration": 5000, "Duration": 1000,
"Value": "0" "Value": "0-3"
},
{
"PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDCPUSETCPUS_RESTRICTED",
"Node": "CDMidCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDMidHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle", "Node": "ReducePreferIdle",
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
@ -544,6 +567,53 @@
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"Value": "LAUNCH_EXTEND"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUMidClusterMaxFreq",
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPULittleClusterMaxFreq",
"Duration": 2000,
"Value": "9999999"
},
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq", "Node": "MemFreq",
@ -802,6 +872,12 @@
"Duration": 3000, "Duration": 3000,
"Value": "9999999" "Value": "9999999"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq", "Node": "CPULittleClusterMaxFreq",
@ -880,6 +956,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold", "Node": "CPUUtilThreshold",
@ -964,6 +1046,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1036,6 +1124,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1114,6 +1208,26 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{ {
"PowerHint": "CAMERA_FIXED_FPS", "PowerHint": "CAMERA_FIXED_FPS",
"Node": "MemFreq", "Node": "MemFreq",

View file

@ -1021,7 +1021,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001