Merge "Clear reference to Global Actions Dialog after it is dismissed" into qt-qpr1-dev

2019-11-25 16:13:41 +00:00
parent 3b179167af 05cda02158
commit b936ac7a23
1 changed files with 4 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -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 {