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

Commit f52cbb6b authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev

parents 92bc9b31 d799db40

media/java/android/media/AudioService.java

+6 −0
Original line number Diff line number Diff line
@@ -670,6 +670,12 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                    ((1 << AudioSystem.STREAM_RING)|(1 << AudioSystem.STREAM_NOTIFICATION)|

                     (1 << AudioSystem.STREAM_SYSTEM)|(1 << AudioSystem.STREAM_SYSTEM_ENFORCED)),

                     UserHandle.USER_CURRENT);



            // ringtone, notification and system streams are always affected by ringer mode

            mRingerModeAffectedStreams |= (1 << AudioSystem.STREAM_RING)|

                                            (1 << AudioSystem.STREAM_NOTIFICATION)|

                                            (1 << AudioSystem.STREAM_SYSTEM);



            if (mVoiceCapable) {

                mRingerModeAffectedStreams &= ~(1 << AudioSystem.STREAM_MUSIC);

            } else {