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

Commit 8a2c2700 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioService: modify unmute on device plug behavior"

parents 2f69ed4a 104e9672

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

+3 −1
Original line number Diff line number Diff line
@@ -4488,6 +4488,7 @@ public class AudioService extends IAudioService.Stub 
        }



        if (mNm.getZenMode() != Settings.Global.ZEN_MODE_NO_INTERRUPTIONS

                && !isStreamMutedByRingerOrZenMode(AudioSystem.STREAM_MUSIC)

                && DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.contains(newDevice)

                && mStreamStates[AudioSystem.STREAM_MUSIC].mIsMuted

                && mStreamStates[AudioSystem.STREAM_MUSIC].getIndex(newDevice) != 0
@@ -6167,6 +6168,7 @@ public class AudioService extends IAudioService.Stub 
        pw.println("\nRinger mode: ");

        pw.println("- mode (internal) = " + RINGER_MODE_NAMES[mRingerMode]);

        pw.println("- mode (external) = " + RINGER_MODE_NAMES[mRingerModeExternal]);

        pw.println("- zen mode:" + Settings.Global.zenModeToString(mNm.getZenMode()));

        dumpRingerModeStreams(pw, "affected", mRingerModeAffectedStreams);

        dumpRingerModeStreams(pw, "muted", mRingerAndZenModeMutedStreams);

        pw.print("- delegate = "); pw.println(mRingerModeDelegate);