Merge "Fix calling forceVolumeControlStream when Volume Dialog hides" into main (843b8537) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -391,12 +391,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
		}

		public void notifyVisible(boolean visible) {
		if (Flags.useVolumeController()) {
		mVolumeControllerAdapter.notifyVolumeControllerVisible(visible);
		} else {
		mWorker.obtainMessage(W.NOTIFY_VISIBLE, visible ? 1 : 0, 0).sendToTarget();
		}
		}

		public void userActivity() {
		mWorker.removeMessages(W.USER_ACTIVITY);
		@@ -457,7 +453,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
		}

		private void onNotifyVisibleW(boolean visible) {
		if (Flags.useVolumeController()) {
		mVolumeControllerAdapter.notifyVolumeControllerVisible(visible);
		} else {
		mAudio.notifyVolumeControllerVisible(mVolumeController, visible);
		}
		if (!visible) {
		if (updateActiveStreamW(-1)) {
		mCallbacks.onStateChanged(mState);