Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev
diff --git a/audio/felix/config/audio_policy_volumes.xml b/audio/felix/config/audio_policy_volumes.xml
index 7e04dfd..7570dff 100644
--- a/audio/felix/config/audio_policy_volumes.xml
+++ b/audio/felix/config/audio_policy_volumes.xml
@@ -51,8 +51,12 @@
<point>66,-2200</point>
<point>100,-1800</point>
</volume>
- <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-4960</point>
+ <point>33,-3650</point>
+ <point>66,-2650</point>
+ <point>100,-1250</point>
+ </volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -173,8 +177,12 @@
<point>66,-2200</point>
<point>100,-1800</point>
</volume>
- <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
- ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+ <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+ <point>1,-6460</point>
+ <point>33,-4490</point>
+ <point>66,-2460</point>
+ <point>100,-1280</point>
+ </volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/felix/tuning/waves/waves_config.ini b/audio/felix/tuning/waves/waves_config.ini
index 24650d0..868bb11 100644
--- a/audio/felix/tuning/waves/waves_config.ini
+++ b/audio/felix/tuning/waves/waves_config.ini
@@ -60,7 +60,7 @@
#AudioFormatIncrement=8
[CUSTOM_ACTION_257]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED
+CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0,PRESET:SPEAKER_MUSIC_FOLDED
CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL
CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED
CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
@@ -70,9 +70,9 @@
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED
+CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:0|2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED
CASE_12=PRIORITY:11,NUMBERS:2:0|1:1|2:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL
-CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE
+CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:0|2:1,PRESET:SPEAKER_MUSIC_RESERVED_UNFOLDED_THROTTLE
CASE_14=PRIORITY:13,NUMBERS:2:0|1:0:1:1,PRESET:SPEAKER_MUSIC_RESERVED_CLAMSHELL_THROTTLE
diff --git a/audio/felix/tuning/waves/waves_preset.mps b/audio/felix/tuning/waves/waves_preset.mps
index 12be993..421611f 100644
--- a/audio/felix/tuning/waves/waves_preset.mps
+++ b/audio/felix/tuning/waves/waves_preset.mps
Binary files differ
diff --git a/device-felix.mk b/device-felix.mk
index aac0d1b..f85537f 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -153,6 +153,7 @@
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true \
+ ro.audio.spatializer_transaural_enabled_default=false \
persist.vendor.audio.spatializer.speaker_enabled=true
# Keymaster HAL
@@ -313,6 +314,7 @@
persist.vendor.camera.extended_launch_boost=1 \
persist.vendor.camera.optimized_tnr_freq=1 \
persist.vendor.camera.raise_buf_allocation_priority=1 \
+ persist.vendor.camera.start_cpu_throttling_at_moderate_thermal=1 \
camera.enable_landscape_to_portrait=true \
persist.vendor.camera.debug.bypass_csi_link_error=true \
vendor.camera.allow_sensor_binning_aspect_ratio_to_override_itp_output=false
diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml
index 510135d..04458fc 100644
--- a/felix/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml
@@ -218,6 +218,9 @@
<!-- Indicates whether to enable hinge angle sensor when using unfold animation -->
<bool name="config_unfoldTransitionHingeAngle">true</bool>
+ <!-- Timeout for receiving the keyguard drawn event from System UI. -->
+ <integer name="config_keyguardDrawnTimeout">1700</integer>
+
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
<bool name="config_faceAuthDismissesKeyguard">true</bool>
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index e09731b..255e82e 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -7,10 +7,12 @@
RADIO/radio.img \
system_ext/etc/permissions/com.shannon.imsservice.xml \
system_ext/etc/permissions/com.shannon.rcsservice.xml \
+ system_ext/etc/permissions/privapp-permissions-qorvo.xml \
system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \
system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \
+ system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
"
;;
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index 462653b..fac7172 100644
--- a/self-extractors/google_devices/staging/Android.mk
+++ b/self-extractors/google_devices/staging/Android.mk
@@ -70,4 +70,20 @@
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := UwbVendorService
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := qorvo
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
+include $(BUILD_PREBUILT)
+
endif
diff --git a/self-extractors/google_devices/staging/device-partial.mk b/self-extractors/google_devices/staging/device-partial.mk
index 4d3d453..736b944 100644
--- a/self-extractors/google_devices/staging/device-partial.mk
+++ b/self-extractors/google_devices/staging/device-partial.mk
@@ -20,6 +20,7 @@
QualifiedNetworksService \
ShannonIms \
ShannonRcs \
+ UwbVendorService \
PRODUCT_PACKAGES += \
libmediaadaptor \
@@ -28,4 +29,5 @@
PRODUCT_COPY_FILES := \
vendor/google_devices/felix/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
vendor/google_devices/felix/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
+ vendor/google_devices/felix/proprietary/privapp-permissions-qorvo.xml:system_ext/etc/permissions/privapp-permissions-qorvo.xml:qorvo \
