Merge "Framework: Fix multi-user support in AudioService" into cm-10.1 (f97e4f34) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -748,11 +748,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		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,
		@@ -3520,8 +3517,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		}
		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 {