[automerger] Merge "AudioService: fix deallock setBluetoothScoOn vs setMode"... (c5841155) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2636,6 +2636,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.
		@@ -2723,9 +2724,8 @@ public class AudioService extends IAudioService.Stub
		synchronized(mSettingsLock) {
		change = mRingerMode != ringerMode;
		mRingerMode = ringerMode;
		}

		muteRingerModeStreams();
		}

		// Post a persist ringer mode msg
		if (persist) {