am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb (da983f73) · Commits · e / os / android_frameworks_base

core/java/android/preference/VolumePreference.java

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -236,16 +236,13 @@ public class VolumePreference extends SeekBarPreference implements
	@Override		@Override
	public void onChange(boolean selfChange) {		public void onChange(boolean selfChange) {
	super.onChange(selfChange);		super.onChange(selfChange);
	if (mSeekBar != null) {		if (mSeekBar != null && mAudioManager != null) {
	int volume = System.getInt(mContext.getContentResolver(),		int volume = mAudioManager.isStreamMute(mStreamType) ?
	System.VOLUME_SETTINGS[mStreamType], -1);		mAudioManager.getLastAudibleStreamVolume(mStreamType)
	// Works around an atomicity problem with volume updates		: mAudioManager.getStreamVolume(mStreamType);
	// TODO: Fix the actual issue, probably in AudioService
	if (volume >= 0) {
	mSeekBar.setProgress(volume);		mSeekBar.setProgress(volume);
	}		}
	}		}
	}
	};		};

	public SeekBarVolumizer(Context context, SeekBar seekBar, int streamType) {		public SeekBarVolumizer(Context context, SeekBar seekBar, int streamType) {