Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioService: Unify multiple device volume selection with APM

Browse Source 
Java selectOneAudioDevice() should match
native apm_extract_one_audio_device().
Generally cosmetic change, but could have implications
if other logic is modified.

Test: compiles
Bug: 220948052
Merged-In: Iabdf49df08a9bb3f92f0673b59ba699818746804
Change-Id: Iabdf49df08a9bb3f92f0673b59ba699818746804
This commit is contained in:
Andy Hung
2022-02-22 17:48:37 -08:00
parent b11e4c7463
commit d4439a06ac
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -6297,13 +6297,16 @@ public class AudioService extends IAudioService.Stub
return AudioSystem.DEVICE_OUT_HDMI_ARC; return AudioSystem.DEVICE_OUT_HDMI_ARC;
} else if (deviceSet.contains(AudioSystem.DEVICE_OUT_HDMI_EARC)) { } else if (deviceSet.contains(AudioSystem.DEVICE_OUT_HDMI_EARC)) {
return AudioSystem.DEVICE_OUT_HDMI_EARC; return AudioSystem.DEVICE_OUT_HDMI_EARC;
} else if (deviceSet.contains(AudioSystem.DEVICE_OUT_SPDIF)) {
return AudioSystem.DEVICE_OUT_SPDIF;
} else if (deviceSet.contains(AudioSystem.DEVICE_OUT_AUX_LINE)) { } else if (deviceSet.contains(AudioSystem.DEVICE_OUT_AUX_LINE)) {
return AudioSystem.DEVICE_OUT_AUX_LINE; return AudioSystem.DEVICE_OUT_AUX_LINE;
} else if (deviceSet.contains(AudioSystem.DEVICE_OUT_SPDIF)) {
return AudioSystem.DEVICE_OUT_SPDIF;
} else { } else {
for (int deviceType : AudioSystem.DEVICE_OUT_ALL_A2DP_SET) { // At this point, deviceSet should contain exactly one A2DP device;
if (deviceSet.contains(deviceType)) { // regardless, return the first A2DP device in numeric order.
// If there is no A2DP device, this falls through to log an error.
for (int deviceType : deviceSet) {
if (AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(deviceType)) {
return deviceType; return deviceType;
} }
} }