Merge Android 13 QPR2

Bug: 273316506
Merged-In: I359adccf70ad468459f17c9990debf85e7834d99
Change-Id: I5ec72d7346fb3393555902ea7987455fd69e2d18
This commit is contained in:
Xin Li 2023-03-13 23:09:46 -07:00
commit 4a8ec78a8e
27 changed files with 451 additions and 87 deletions

View file

@ -230,6 +230,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

@ -200,7 +200,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -175,7 +175,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -190,7 +190,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -230,6 +230,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

@ -200,7 +200,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -175,7 +175,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -190,7 +190,7 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"

View file

@ -162,6 +162,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

@ -162,6 +162,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

@ -171,7 +171,7 @@ endif
# 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=43 ro.vendor.build.svn=46
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -252,6 +252,10 @@ endif
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true ro.audio.spatializer_enabled=true
# optimize spatializer effect
PRODUCT_PROPERTY_OVERRIDES += \
audio.spatializer.effect.util_clamp_min=300
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libspatialaudio libspatialaudio

View file

@ -180,7 +180,7 @@ endif
# 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=43 ro.vendor.build.svn=46
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -265,6 +265,10 @@ endif
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true ro.audio.spatializer_enabled=true
# optimize spatializer effect
PRODUCT_PROPERTY_OVERRIDES += \
audio.spatializer.effect.util_clamp_min=300
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libspatialaudio libspatialaudio
@ -286,6 +290,9 @@ PRODUCT_RESTRICT_VENDOR_FILES := false
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true debug.sf.enable_adpf_cpu_hint=true
# Display RRS default Config
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120
# Bluetooth OPUS codec # Bluetooth OPUS codec
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true

View file

@ -80,9 +80,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 492,0 M 492,0
h 124 h 118
v 118 v 128
h -124 h -118
Z Z
@left @left
</string> </string>
@ -94,7 +94,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_height_default">74px</dimen> <dimen name="status_bar_height_height_default">74px</dimen>
<dimen name="status_bar_height_portrait">118px</dimen> <dimen name="status_bar_height_portrait">128px</dimen>
<dimen name="status_bar_height_landscape">74px</dimen> <dimen name="status_bar_height_landscape">74px</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

@ -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",
@ -207,6 +198,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"
], ],
@ -216,6 +208,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"
], ],
@ -225,6 +218,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"
], ],
@ -234,6 +228,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"
], ],
@ -304,6 +299,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",
@ -488,14 +493,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"
}, },
@ -553,6 +576,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",
@ -811,6 +881,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",
@ -889,6 +965,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",
@ -973,6 +1055,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",
@ -1045,6 +1133,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",
@ -1123,6 +1217,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

@ -167,16 +167,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",
@ -206,6 +197,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"
], ],
@ -215,6 +207,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"
], ],
@ -224,6 +217,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"
], ],
@ -233,6 +227,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"
], ],
@ -303,6 +298,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",
@ -487,14 +492,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"
}, },
@ -552,6 +575,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",
@ -810,6 +880,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",
@ -888,6 +964,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",
@ -972,6 +1054,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",
@ -1044,6 +1132,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",
@ -1122,6 +1216,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": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",

View file

@ -177,15 +177,6 @@
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "UClampThreshold",
"Path": "/proc/vendor_sched/uclamp_threshold",
"Values": [
"0",
"8"
],
"ResetOnInit": true
},
{ {
"Name": "ReduceRreferIdle", "Name": "ReduceRreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle", "Path": "/proc/vendor_sched/reduce_prefer_idle",
@ -428,12 +419,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "85" "Value": "85"
}, },
{
"PowerHint": "LAUNCH",
"Node": "UClampThreshold",
"Duration": 5000,
"Value": "0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle", "Node": "ReduceRreferIdle",

View file

@ -177,15 +177,6 @@
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "UClampThreshold",
"Path": "/proc/vendor_sched/uclamp_threshold",
"Values": [
"0",
"8"
],
"ResetOnInit": true
},
{ {
"Name": "ReduceRreferIdle", "Name": "ReduceRreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle", "Path": "/proc/vendor_sched/reduce_prefer_idle",
@ -419,12 +410,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "85" "Value": "85"
}, },
{
"PowerHint": "LAUNCH",
"Node": "UClampThreshold",
"Duration": 5000,
"Value": "0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle", "Node": "ReduceRreferIdle",

View file

@ -34,9 +34,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 653,0 M 653,0
h 145 h 130
v 130 v 145
h -145 h -130
Z Z
@left @left
</string> </string>
@ -194,7 +194,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">130px</dimen> <dimen name="status_bar_height_portrait">145px</dimen>
<dimen name="status_bar_height_landscape">28dp</dimen> <dimen name="status_bar_height_landscape">28dp</dimen>
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default--> <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->

View file

@ -652,7 +652,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -667,7 +667,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -682,7 +682,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -697,7 +697,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -1159,7 +1159,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001

View file

@ -626,7 +626,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -641,7 +641,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -656,7 +656,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -671,7 +671,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
@ -1133,7 +1133,7 @@
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
115.0 "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001

View file

@ -139,3 +139,4 @@ coex_gpio=4
coex_delay_us=1000 coex_delay_us=1000
coex_margin_us=500 coex_margin_us=500
coex_interval_us=2000 coex_interval_us=2000
alternate_pulse_shape=0x00

View file

@ -139,3 +139,4 @@ coex_gpio=4
coex_delay_us=1000 coex_delay_us=1000
coex_margin_us=500 coex_margin_us=500
coex_interval_us=2000 coex_interval_us=2000
alternate_pulse_shape=0x00

View file

@ -139,3 +139,4 @@ coex_gpio=4
coex_delay_us=1000 coex_delay_us=1000
coex_margin_us=500 coex_margin_us=500
coex_interval_us=2000 coex_interval_us=2000
alternate_pulse_shape=0x00

View file

@ -139,3 +139,4 @@ coex_gpio=4
coex_delay_us=1000 coex_delay_us=1000
coex_margin_us=500 coex_margin_us=500
coex_interval_us=2000 coex_interval_us=2000
alternate_pulse_shape=0x00

View file

@ -139,3 +139,4 @@ coex_gpio=4
coex_delay_us=1000 coex_delay_us=1000
coex_margin_us=500 coex_margin_us=500
coex_interval_us=2000 coex_interval_us=2000
alternate_pulse_shape=0x00

142
uwb/UWB-calibration.conf Normal file
View file

@ -0,0 +1,142 @@
[CCC]version=2
[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
[CCC]ant0.ch5.prf64.pdoa_offset=0
[CCC]ant0.ch9.prf64.pdoa_offset=0
[CCC]ant0.ch5.prf64.pll_locking_code=0
[CCC]ant0.ch9.prf64.pll_locking_code=0
[CCC]id=0
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
[CCC]antenna_selection=4
[CCC]wifi_coex_min_spacing=0x08
ant0.ch5.prf16.ant_delay=16414
ant0.ch5.prf16.tx_power=0x47472347
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x34
ant0.ch5.prf64.ant_delay=16414
ant0.ch5.prf64.tx_power=0x47472347
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x34
ant0.ch9.prf16.ant_delay=16426
ant0.ch9.prf16.tx_power=0x2A2A2A2A
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x20
ant0.ch9.prf64.ant_delay=16426
ant0.ch9.prf64.tx_power=0x2A2A2A2A
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x20
ant0.port=0
ant0.selector_gpio=7
ant0.selector_gpio_value=0
ant1.ch5.prf16.ant_delay=16446
ant1.ch5.prf16.tx_power=0x5B5B2B5B
ant1.ch5.prf16.pg_count=0
ant1.ch5.prf16.pg_delay=0x20
ant1.ch5.prf64.ant_delay=16446
ant1.ch5.prf64.tx_power=0x5B5B2B5B
ant1.ch5.prf64.pg_count=0
ant1.ch5.prf64.pg_delay=0x20
ant1.ch9.prf16.ant_delay=16429
ant1.ch9.prf16.tx_power=0
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0
ant1.ch9.prf64.ant_delay=16429
ant1.ch9.prf64.tx_power=0
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0
ant1.port=0
ant1.selector_gpio=7
ant1.selector_gpio_value=1
ant2.ch5.prf16.ant_delay=16446
ant2.ch5.prf16.tx_power=0
ant2.ch5.prf16.pg_count=0
ant2.ch5.prf16.pg_delay=0
ant2.ch5.prf64.ant_delay=16446
ant2.ch5.prf64.tx_power=0
ant2.ch5.prf64.pg_count=0
ant2.ch5.prf64.pg_delay=0
ant2.ch9.prf16.ant_delay=16429
ant2.ch9.prf16.tx_power=0x5F5F2F5F
ant2.ch9.prf16.pg_count=0
ant2.ch9.prf16.pg_delay=0x26
ant2.ch9.prf64.ant_delay=16429
ant2.ch9.prf64.tx_power=0x5F5F2F5F
ant2.ch9.prf64.pg_count=0
ant2.ch9.prf64.pg_delay=0x26
ant2.port=1
ant2.selector_gpio=6
ant2.selector_gpio_value=0
ant3.ch5.prf16.ant_delay=16446
ant3.ch5.prf16.tx_power=0
ant3.ch5.prf16.pg_count=0
ant3.ch5.prf16.pg_delay=0
ant3.ch5.prf64.ant_delay=16446
ant3.ch5.prf64.tx_power=0
ant3.ch5.prf64.pg_count=0
ant3.ch5.prf64.pg_delay=0
ant3.ch9.prf16.ant_delay=16429
ant3.ch9.prf16.tx_power=0x5F5F2F5F
ant3.ch9.prf16.pg_count=0
ant3.ch9.prf16.pg_delay=0x26
ant3.ch9.prf64.ant_delay=16429
ant3.ch9.prf64.tx_power=0x5F5F2F5F
ant3.ch9.prf64.pg_count=0
ant3.ch9.prf64.pg_delay=0x26
ant3.port=1
ant3.selector_gpio=6
ant3.selector_gpio_value=1
ant0.ant1.ch5.pdoa_offset=0
ant0.ant1.ch9.pdoa_offset=0
ant0.ant2.ch5.pdoa_offset=0
ant0.ant2.ch9.pdoa_offset=0
ant1.ant2.ch5.pdoa_offset=0
ant1.ant2.ch9.pdoa_offset=0
ant0.ant3.ch5.pdoa_offset=0
ant0.ant3.ch9.pdoa_offset=0
ant1.ant3.ch5.pdoa_offset=-4710
ant1.ant3.ch9.pdoa_offset=-6144
ant2.ant3.ch5.pdoa_offset=0
ant2.ant3.ch9.pdoa_offset=0
ch5.pll_locking_code=0
ch9.pll_locking_code=0
ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a
ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a
xtal_trim=31
temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0
[HAL]aoa_capability=1
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6
[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6
[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4
[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4
[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4
[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4
[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6
[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6
[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6
[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6
[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6
[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1
[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0
[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0
[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6
[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1
[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0
[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0
[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4
[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4
[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8
[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8
[HAL]minimum_system_offset_uwbtime0=250
coex_gpio=4
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
alternate_pulse_shape=0x01

View file

@ -21,7 +21,7 @@ LOCAL_UWB_CAL_DIR=device/google/raviole/uwb
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_UWB_CAL_DIR)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \
$(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \
$(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \
$(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \