commit | 05cda0215883b140e36a2304af84a5baa004b348 | [log] [tgz] |
---|---|---|
author | Steve Elliott <steell@google.com> | Wed Nov 20 19:34:57 2019 -0500 |
committer | Steve Elliott <steell@google.com> | Fri Nov 22 19:29:44 2019 +0000 |
tree | a9215993c3b913fe32ec617592d2446ef5992f47 | |
parent | 65c96651257a5c3f439cc16097dcef40dccd7e18 [diff] |
Clear reference to Global Actions Dialog after it is dismissed Fixes: 141681179 Test: manual, atest Change-Id: Ic8bdc77a3b590577d565f2225352be192ea8fabf Merged-In: Ic8bdc77a3b590577d565f2225352be192ea8fabf
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index a24432f..a48b9e6 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -417,9 +417,7 @@ new GlobalActionsPanelPlugin.Callbacks() { @Override public void dismissGlobalActionsMenu() { - if (mDialog != null) { - mDialog.dismiss(); - } + dismissDialog(); } @Override @@ -915,6 +913,9 @@ /** {@inheritDoc} */ public void onDismiss(DialogInterface dialog) { + if (mDialog == dialog) { + mDialog = null; + } mWindowManagerFuncs.onGlobalActionsHidden(); if (mShowSilentToggle) { try {