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

Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev

Browse Source
This commit is contained in:
Eric Laurent
2017-10-03 15:32:56 +00:00
committed by Android (Google) Code Review
parent 9cb14a0c95 7fb83d9208
commit 0f6e9b5a79
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4158,7 +4158,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)