Merge "Clear reference to Global Actions Dialog after it is dismissed" into qt-qpr1-dev (6304bee0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -417,9 +417,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		new GlobalActionsPanelPlugin.Callbacks() {
		@Override
		public void dismissGlobalActionsMenu() {
		if (mDialog != null) {
		mDialog.dismiss();
		}
		dismissDialog();
		}

		@Override
		@@ -915,6 +913,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,

		/** {@inheritDoc} */
		public void onDismiss(DialogInterface dialog) {
		if (mDialog == dialog) {
		mDialog = null;
		}
		mWindowManagerFuncs.onGlobalActionsHidden();
		if (mShowSilentToggle) {
		try {