Merge "audio: waves: use SPEAKER_MUSIC in call screen" into 24D1-dev am: a14ac10803
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27555217 Change-Id: Iecfd54429be7ed19e383abd3b78bb1bdc810e2f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
78751fbfb0
3 changed files with 27 additions and 27 deletions
|
@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
|||
#AudioFormatIncrement=8
|
||||
|
||||
[CUSTOM_ACTION_260]
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
|
||||
# - audio_devices_t : current active device
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
|
||||
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||
# - sound_usage_t: 0 - Music, 1 - Movie
|
|
@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
|||
#AudioFormatIncrement=8
|
||||
|
||||
[CUSTOM_ACTION_260]
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
|
||||
# - audio_devices_t : current active device
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
|
||||
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||
# - sound_usage_t: 0 - Music, 1 - Movie
|
|
@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
|||
#AudioFormatIncrement=8
|
||||
|
||||
[CUSTOM_ACTION_260]
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
|
||||
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
|
||||
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
|
||||
# - audio_devices_t : current active device
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
|
||||
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
|
||||
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||
# - sound_usage_t: 0 - Music, 1 - Movie
|
Loading…
Add table
Add a link
Reference in a new issue