Merge "Disable transaural spatialization by default" into tm-qpr-dev
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/device-felix.mk b/device-felix.mk
index 3f15463..f85537f 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -314,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
