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

am: b936ac7a23

Change-Id: Icb3d9ba077773c78eaac24690bb97fb64fbe0198

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 {