Merge "Fix ringer mode being unneededly changed by setting ringer mode volume to 0." into cm-10.1 (fc5f644a) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -319,6 +319,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		*/
		// protected by mSettingsLock
		private int mRingerMode;
		// last non-normal ringer mode
		private int mLastSilentRingerMode = -1;

		/** @see System#MODE_RINGER_STREAMS_AFFECTED */
		private int mRingerModeAffectedStreams;
		@@ -1002,8 +1004,14 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		(mStreamVolumeAlias[streamType] == getMasterStreamType())) {
		int newRingerMode;
		if (index == 0) {
		synchronized (mSettingsLock) {
		if (mLastSilentRingerMode != -1) {
		newRingerMode = mLastSilentRingerMode;
		} else {
		newRingerMode = mHasVibrator ? AudioManager.RINGER_MODE_VIBRATE
		: AudioManager.RINGER_MODE_SILENT;
		}
		}
		setStreamVolumeInt(mStreamVolumeAlias[streamType],
		index,
		device,
		@@ -1359,6 +1367,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		private void setRingerModeInt(int ringerMode, boolean persist) {
		synchronized(mSettingsLock) {
		mRingerMode = ringerMode;
		if (ringerMode != AudioManager.RINGER_MODE_NORMAL) {
		mLastSilentRingerMode = ringerMode;
		}
		}

		// Mute stream if not previously muted by ringer mode and ringer mode