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

Commit 03e54d06 authored by Hongwei Wang's avatar Hongwei Wang Committed by android-build-merger
Browse files

Merge "Loosen the user id check for master mute on automotive" into qt-dev am: 7a1d5ee3

am: db7a8cb1

Change-Id: I9130af4bcde39dade1dea10db8cacedab67d5e08
parents e4dde98d db7a8cb1
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -2697,7 +2697,13 @@ public class AudioService extends IAudioService.Stub
            // The isPlatformAutomotive check is added for safety but may not be necessary.
            return;
        }
        if (getCurrentUserId() == userId) {
        // For automotive,
        // - the car service is always running as system user
        // - foreground users are non-system users
        // Car service is in charge of dispatching the key event include master mute to Android.
        // Therefore, the getCurrentUser() is always different to the foreground user.
        if ((isPlatformAutomotive() && userId == UserHandle.USER_SYSTEM)
                || (getCurrentUserId() == userId)) {
            if (mute != AudioSystem.getMasterMute()) {
                setSystemAudioMute(mute);
                AudioSystem.setMasterMute(mute);