Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 8a12361b8c

Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
This commit is contained in:
Jean-Michel Trivi
2018-06-11 22:18:53 -07:00
committed by android-build-merger
parent e10d2c53fa 8a12361b8c
commit 257b52411c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -2632,6 +2632,7 @@ public class AudioService extends IAudioService.Stub
broadcastRingerMode(AudioManager.RINGER_MODE_CHANGED_ACTION, ringerMode); broadcastRingerMode(AudioManager.RINGER_MODE_CHANGED_ACTION, ringerMode);
} }
@GuardedBy("mSettingsLock")
private void muteRingerModeStreams() { private void muteRingerModeStreams() {
// Mute stream if not previously muted by ringer mode and (ringer mode // 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. // is not RINGER_MODE_NORMAL OR stream is zen muted) and stream is affected by ringer mode.
@@ -2719,10 +2720,9 @@ public class AudioService extends IAudioService.Stub
synchronized(mSettingsLock) { synchronized(mSettingsLock) {
change = mRingerMode != ringerMode; change = mRingerMode != ringerMode;
mRingerMode = ringerMode; mRingerMode = ringerMode;
muteRingerModeStreams();
} }
muteRingerModeStreams();
// Post a persist ringer mode msg // Post a persist ringer mode msg
if (persist) { if (persist) {
sendMsg(mAudioHandler, MSG_PERSIST_RINGER_MODE, sendMsg(mAudioHandler, MSG_PERSIST_RINGER_MODE,