Merge "AudioManager: restore getVolumeGroupIdForAttributes behavior" into tm-qpr-dev am: 02cdf72ad3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21264485

Change-Id: I42c8c406fd587a06140bc0643c661ce8323de57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Laurent
2023-02-06 11:07:42 +00:00
committed by Automerger Merge Worker

View File

@@ -1409,7 +1409,7 @@ public class AudioManager {
public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) { public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) {
Preconditions.checkNotNull(attributes, "Audio Attributes must not be null"); Preconditions.checkNotNull(attributes, "Audio Attributes must not be null");
return AudioProductStrategy.getVolumeGroupIdForAudioAttributes(attributes, return AudioProductStrategy.getVolumeGroupIdForAudioAttributes(attributes,
/* fallbackOnDefault= */ false); /* fallbackOnDefault= */ true);
} }
/** /**