summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2023-02-03 20:50:06 +0100
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-14 02:22:58 +0000
commitdea291daeb46ef6bf6c5519266ec86b4a54ee67a (patch)
tree399e9e21d48cc71a0fbd2816581ac4d647f801f6
parent27e2390fd3598e63ac90a3e519eeb919c4eceb1a (diff)
downloadbase-dea291daeb46ef6bf6c5519266ec86b4a54ee67a.tar.gz
AudioManager: restore getVolumeGroupIdForAttributes behavior
Allow getVolumeGroupIdForAttributes() to fallback to default volume group as it was before commiti c8e375e0. Bug: 267588552 Test: atest AudioServiceHostTest#testAudioVolumeGroups Change-Id: I571ffd8c1b51bbce943bfac4cd4f628e282fcc12 (cherry picked from commit on googleplex-android-review.googlesource.com host: 00c916c5f0fbb32cd502c739ab00fe49a3a834a6) Merged-In: I571ffd8c1b51bbce943bfac4cd4f628e282fcc12
-rw-r--r--media/java/android/media/AudioManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 2c139b72eab3..67efe3a55db7 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1409,7 +1409,7 @@ public class AudioManager {
public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) {
Preconditions.checkNotNull(attributes, "Audio Attributes must not be null");
return AudioProductStrategy.getVolumeGroupIdForAudioAttributes(attributes,
- /* fallbackOnDefault= */ false);
+ /* fallbackOnDefault= */ true);
}
/**