Merge "Protect volumepanel slider creation from race condition." into jb-dev (4a3a9685) · Commits · e / os / android_frameworks_base

core/java/android/view/VolumePanel.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -437,9 +437,11 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie

		public void postVolumeChanged(int streamType, int flags) {
		if (hasMessages(MSG_VOLUME_CHANGED)) return;
		synchronized (this) {
		if (mStreamControls == null) {
		createSliders();
		}
		}
		removeMessages(MSG_FREE_RESOURCES);
		obtainMessage(MSG_VOLUME_CHANGED, streamType, flags).sendToTarget();
		}
		@@ -450,9 +452,11 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie

		public void postMuteChanged(int streamType, int flags) {
		if (hasMessages(MSG_VOLUME_CHANGED)) return;
		synchronized (this) {
		if (mStreamControls == null) {
		createSliders();
		}
		}
		removeMessages(MSG_FREE_RESOURCES);
		obtainMessage(MSG_MUTE_CHANGED, streamType, flags).sendToTarget();
		}
		@@ -471,11 +475,13 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		if (LOGD) Log.d(TAG, "onVolumeChanged(streamType: " + streamType + ", flags: " + flags + ")");

		if ((flags & AudioManager.FLAG_SHOW_UI) != 0) {
		synchronized (this) {
		if (mActiveStreamType != streamType) {
		reorderSliders(streamType);
		}
		onShowVolumeChanged(streamType, flags);
		}
		}

		if ((flags & AudioManager.FLAG_PLAY_SOUND) != 0 && ! mRingIsSilent) {
		removeMessages(MSG_PLAY_SOUND);