commit c3147e244ae9ffca905f55f418c4b44896c2de83
author Steve Elliott <steell@google.com> Wed Nov 20 19:34:57 2019 -0500
committer Steve Elliott <steell@google.com> Sat Nov 23 05:04:43 2019 +0000
tree e69d94c7c259d9838dead717362a698ad9476c06
parent 4aeff5ba6e7d9db3eab00a54baf361084445a888

Clear reference to Global Actions Dialog after it is dismissed

Fixes: 141681179
Test: manual, atest
Change-Id: Ic8bdc77a3b590577d565f2225352be192ea8fabf

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

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 51c2ddc..b5845947 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -419,9 +419,7 @@
                                 new GlobalActionsPanelPlugin.Callbacks() {
                                     @Override
                                     public void dismissGlobalActionsMenu() {
-                                        if (mDialog != null) {
-                                            mDialog.dismiss();
-                                        }
+                                        dismissDialog();
                                     }
 
                                     @Override
@@ -916,6 +914,9 @@
 
     /** {@inheritDoc} */
     public void onDismiss(DialogInterface dialog) {
+        if (mDialog == dialog) {
+            mDialog = null;
+        }
         mWindowManagerFuncs.onGlobalActionsHidden();
         if (mShowSilentToggle) {
             try {