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

Commit d799db40 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioService: add fix for corrupted settings 

Added correction of MODE_RINGER_STREAMS_AFFECTED setting in
case it is inconsistent when read from the database: ringtone,
notification and system streams are always affected by ringer mode.
A corruption of this setting persists accross reboots and propagates via
backup/restore causing devices to play notification and ringtones in silent mode.

Bug 7384750.

Change-Id: I23170413d01e6a8e34ef514f1516d7b9ab8bc656
parent 0058f4ed

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 {