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

Commit c196ba6a authored by DvTonder's avatar DvTonder Committed by Ricardo Cerqueira
Browse files

Framework: Fix multi-user support in AudioService 

Change-Id: Iddeeeac0734a237103e238bcdaa1e85806a64e4f
parent f1b576a5

media/java/android/media/AudioService.java

+4 −7
Original line number Diff line number Diff line
@@ -734,11 +734,8 @@ public class AudioService extends IAudioService.Stub { 
            readDockAudioSettings(cr);

        }



        //******************************************************************

        //TODO: should this be a user specific setting or device (see below)

        mLinkNotificationWithVolume = Settings.System.getInt(cr,

                Settings.System.VOLUME_LINK_NOTIFICATION, 1) == 1;

        //******************************************************************

        mLinkNotificationWithVolume = Settings.System.getIntForUser(cr,

                Settings.System.VOLUME_LINK_NOTIFICATION, 1, UserHandle.USER_CURRENT) == 1;



        mMuteAffectedStreams = System.getIntForUser(cr,

                System.MUTE_STREAMS_AFFECTED,
@@ -3749,8 +3746,8 @@ public class AudioService extends IAudioService.Stub { 
                }

                readDockAudioSettings(mContentResolver);



                mLinkNotificationWithVolume = Settings.System.getInt(mContentResolver,

                        Settings.System.VOLUME_LINK_NOTIFICATION, 1) == 1;

                mLinkNotificationWithVolume = Settings.System.getIntForUser(mContentResolver,

                        Settings.System.VOLUME_LINK_NOTIFICATION, 1, UserHandle.USER_CURRENT) == 1;

                if (mLinkNotificationWithVolume) {

                    mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

                } else {