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

Commit 23104030 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "AudioService: do not unmute media on headset plug in total silence... 

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

Change-Id: If21221f4345adaebba2e3c23d641a12d9d1fda67
parents 48ffde7e ff9a8214

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

+2 −1
Original line number Diff line number Diff line
@@ -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)