diff options
| author | 2017-09-28 09:36:36 -0700 | |
|---|---|---|
| committer | 2017-09-28 09:39:46 -0700 | |
| commit | 7fb83d920856884bf801d7d7c0c9755fde69cfbb (patch) | |
| tree | 6a619dab3fb415943fa96a3592a4d36fecbe566c | |
| parent | 8f22de0e7f1c84c3f9e4ca55e6b2ad033ef421de (diff) | |
AudioService: do not unmute media on headset plug in total silence mode
Fix regression introduced by fix for issue 30440012.
Bug: 66893057
Test: play a video on Chrome in DnD total silence and plug a wired
headset
Change-Id: Iee11f06edda0749a15021a4682467c14289677c3
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 3c1f2d42707a..895f8d1aacb8 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4154,7 +4154,8 @@ public class AudioService extends IAudioService.Stub newDevice, AudioSystem.getOutputDeviceName(newDevice))); } synchronized (mConnectedDevices) { - if ((newDevice & DEVICE_MEDIA_UNMUTED_ON_PLUG) != 0 + if (mNm.getZenMode() != Settings.Global.ZEN_MODE_NO_INTERRUPTIONS + && (newDevice & DEVICE_MEDIA_UNMUTED_ON_PLUG) != 0 && mStreamStates[AudioSystem.STREAM_MUSIC].mIsMuted && mStreamStates[AudioSystem.STREAM_MUSIC].getIndex(newDevice) != 0 && (newDevice & AudioSystem.getDevicesForStream(AudioSystem.STREAM_MUSIC)) != 0) |