Merge "[automerger skipped] Merge Android 13 QPR1 am: 96a072abdd -s ours" into stage-aosp-master am: 574d6031ef -s ours
am skip reason: Merged-In Ieb8251bd31280cbb293207480fb46e9d2447c8b8 with SHA-1 df54c528bf is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2338067
Change-Id: I9de2bf67007f25ae25d2055bf2e5e860c944dde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index fa5571c..4ddf658 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -230,6 +230,8 @@
<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_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_NREC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 1e27950..c270ed8 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -200,7 +200,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index e106936..ddf3a1a 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -175,7 +175,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
index 3c8466a..1455600 100644
--- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
@@ -190,7 +190,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index fa5571c..4ddf658 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -230,6 +230,8 @@
<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_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_NREC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 1e27950..c270ed8 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -200,7 +200,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index e106936..ddf3a1a 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -175,7 +175,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
index 3c8466a..1455600 100644
--- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
@@ -190,7 +190,7 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<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"
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Earpiece"
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index 3d183b0..a50760f 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -162,6 +162,8 @@
<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_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_NREC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index 3d183b0..a50760f 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -162,6 +162,8 @@
<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_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_NREC_BE_CFG" latency="40000"/>
<be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index d5212db..4208da8 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -1,3 +1,5 @@
# This is BTBCM HAL overlay configuration file.
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
+
+BtOpusEnabled = true
diff --git a/device-oriole.mk b/device-oriole.mk
index c9e69ab..bd68efe 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=41
+ ro.vendor.build.svn=43
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -243,9 +243,9 @@
persist.bluetooth.le_audio_test=false
endif
-# declare use of spatial audio: disabled
+# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
- ro.audio.spatializer_enabled=false
+ ro.audio.spatializer_enabled=true
PRODUCT_PACKAGES += \
libspatialaudio
@@ -267,3 +267,7 @@
# Enable adpf cpu hint session for SurfaceFlinger
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true
+
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.opus.enabled=true
diff --git a/device-raven.mk b/device-raven.mk
index c337c13..6932c95 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -180,7 +180,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=41
+ ro.vendor.build.svn=43
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -256,9 +256,9 @@
persist.bluetooth.le_audio_test=false
endif
-# declare use of spatial audio: disabled
+# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
- ro.audio.spatializer_enabled=false
+ ro.audio.spatializer_enabled=true
PRODUCT_PACKAGES += \
libspatialaudio
@@ -280,3 +280,10 @@
# Enable adpf cpu hint session for SurfaceFlinger
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
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
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.opus.enabled=true
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 13aa728..06710b2 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -80,9 +80,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 492,0
- h 124
- v 118
- h -124
+ h 118
+ v 128
+ h -118
Z
@left
</string>
@@ -94,7 +94,7 @@
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_portrait">118px</dimen>
+ <dimen name="status_bar_height_portrait">128px</dimen>
<dimen name="status_bar_height_landscape">74px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index cbbbbae..a356673 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -168,16 +168,7 @@
"ResetOnInit": true
},
{
- "Name": "UClampThreshold",
- "Path": "/proc/vendor_sched/uclamp_threshold",
- "Values": [
- "0",
- "8"
- ],
- "ResetOnInit": true
- },
- {
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -207,6 +198,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -216,6 +208,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -225,6 +218,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -234,6 +228,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -305,6 +300,16 @@
"Type": "Property"
},
{
+ "Name": "PowerHALCameraRunning",
+ "Path": "vendor.powerhal.camerarunning",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "Type": "Property",
+ "ResetOnInit": true
+ },
+ {
"Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
"Values": [
@@ -488,14 +493,32 @@
],
"Actions": [
{
- "PowerHint": "LAUNCH",
- "Node": "UClampThreshold",
- "Duration": 5000,
- "Value": "0"
+ "PowerHint": "CDCPUSET_RESTRICTED",
+ "Node": "CDCpuset",
+ "Duration": 1000,
+ "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",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -554,6 +577,53 @@
"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",
"Node": "MemFreq",
"Duration": 1000,
@@ -813,6 +883,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -891,6 +967,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -975,6 +1057,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1047,6 +1135,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1124,6 +1218,26 @@
"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",
"Node": "MemFreq",
"Duration": 4000,
diff --git a/powerhint-raven.json b/powerhint-raven.json
index a232909..ea95391 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -167,16 +167,7 @@
"ResetOnInit": true
},
{
- "Name": "UClampThreshold",
- "Path": "/proc/vendor_sched/uclamp_threshold",
- "Values": [
- "0",
- "8"
- ],
- "ResetOnInit": true
- },
- {
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -206,6 +197,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -215,6 +207,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -224,6 +217,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -233,6 +227,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -304,6 +299,16 @@
"Type": "Property"
},
{
+ "Name": "PowerHALCameraRunning",
+ "Path": "vendor.powerhal.camerarunning",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "Type": "Property",
+ "ResetOnInit": true
+ },
+ {
"Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
"Values": [
@@ -487,14 +492,32 @@
],
"Actions": [
{
- "PowerHint": "LAUNCH",
- "Node": "UClampThreshold",
- "Duration": 5000,
- "Value": "0"
+ "PowerHint": "CDCPUSET_RESTRICTED",
+ "Node": "CDCpuset",
+ "Duration": 1000,
+ "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",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -553,6 +576,53 @@
"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",
"Node": "MemFreq",
"Duration": 1000,
@@ -812,6 +882,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -890,6 +966,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -974,6 +1056,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1046,6 +1134,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1123,6 +1217,26 @@
"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",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 4c50d32..af20ff5 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -178,15 +178,6 @@
"ResetOnInit": true
},
{
- "Name": "UClampThreshold",
- "Path": "/proc/vendor_sched/uclamp_threshold",
- "Values": [
- "0",
- "8"
- ],
- "ResetOnInit": true
- },
- {
"Name": "ReduceRreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
@@ -430,12 +421,6 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "UClampThreshold",
- "Duration": 5000,
- "Value": "0"
- },
- {
- "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle",
"Duration": 5000,
"Value": "0"
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index b7f5dea..60c299f 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -178,15 +178,6 @@
"ResetOnInit": true
},
{
- "Name": "UClampThreshold",
- "Path": "/proc/vendor_sched/uclamp_threshold",
- "Values": [
- "0",
- "8"
- ],
- "ResetOnInit": true
- },
- {
"Name": "ReduceRreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
@@ -421,12 +412,6 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "UClampThreshold",
- "Duration": 5000,
- "Value": "0"
- },
- {
- "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle",
"Duration": 5000,
"Value": "0"
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 7c7b5b7..81e51c4 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -34,9 +34,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 653,0
- h 145
- v 130
- h -145
+ h 130
+ v 145
+ h -130
Z
@left
</string>
@@ -194,7 +194,7 @@
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
<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>
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 837ccbf..d73d66a 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -652,7 +652,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -667,7 +667,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -682,7 +682,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -697,7 +697,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -1159,7 +1159,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index d452757..bb7af7b 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -626,7 +626,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -641,7 +641,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -656,7 +656,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -671,7 +671,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
@@ -1133,7 +1133,7 @@
"NAN",
"NAN",
"NAN",
- 115.0
+ "NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 231e286..12b7f47 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -139,3 +139,4 @@
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
+alternate_pulse_shape=0x00
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 5e99376..25b1bb1 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -139,3 +139,4 @@
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
+alternate_pulse_shape=0x00
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 5e99376..25b1bb1 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -139,3 +139,4 @@
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
+alternate_pulse_shape=0x00
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index 338d4f6..681a5f3 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -139,3 +139,4 @@
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
+alternate_pulse_shape=0x00
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index 685469d..7bd68dc 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -139,3 +139,4 @@
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
+alternate_pulse_shape=0x00
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
new file mode 100644
index 0000000..47d917c
--- /dev/null
+++ b/uwb/UWB-calibration.conf
@@ -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
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 3889a08..f6dc7c7 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -21,7 +21,7 @@
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-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 \
PRODUCT_COPY_FILES += \