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

Commit f3e07916 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev 

am: 8a12361b

Change-Id: Iba3c61d775b47919a63a47982c0197d125dddf54
parents 77be0970 8a12361b

services/core/java/com/android/server/audio/AudioService.java

+2 −2
Original line number Diff line number Diff line
@@ -2623,6 +2623,7 @@ public class AudioService extends IAudioService.Stub 
        broadcastRingerMode(AudioManager.RINGER_MODE_CHANGED_ACTION, ringerMode);

    }



    @GuardedBy("mSettingsLock")

    private void muteRingerModeStreams() {

        // Mute stream if not previously muted by ringer mode and (ringer mode

        // is not RINGER_MODE_NORMAL OR stream is zen muted) and stream is affected by ringer mode.
@@ -2710,9 +2711,8 @@ public class AudioService extends IAudioService.Stub 
        synchronized(mSettingsLock) {

            change = mRingerMode != ringerMode;

            mRingerMode = ringerMode;

        }



            muteRingerModeStreams();

        }



        // Post a persist ringer mode msg

        if (persist) {