Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c807fa6 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I42c8c406fd587a06140bc0643c661ce8323de57c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77206948 02cdf72a

media/java/android/media/AudioManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

    }

    }





    /**

    /**