From 6560ab752dd54e5e8e6d5c756e52cd6984a522fa Mon Sep 17 00:00:00 2001
From: Aran Ink <nesciosquid@google.com>
Date: Mon, 20 Apr 2020 16:04:29 -0400
Subject: [PATCH] Ensure power menu overflow dismissed when dialog dismissed.

Test: Manual -- pressing power button while power overflow menu is shown does not result in overflow menu still appearing on lock screen.

Fixes: 154441764
Change-Id: Icc7d158a7ff78b06d2234a5a11eb10b3c75a5ba7
---
 .../systemui/globalactions/GlobalActionsDialog.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index ea358c74a0e03..322660521ee08 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -2230,6 +2230,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
                     })
                     .start();
             dismissPanel();
+            dismissOverflow();
             resetOrientation();
         }
 
@@ -2237,6 +2238,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
             mShowing = false;
             if (mControlsUiController != null) mControlsUiController.hide();
             dismissPanel();
+            dismissOverflow();
             resetOrientation();
             completeDismiss();
         }
@@ -2253,6 +2255,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
             }
         }
 
+        private void dismissOverflow() {
+            if (mOverflowPopup != null) {
+                mOverflowPopup.dismiss();
+            }
+        }
+
         private void setRotationSuggestionsEnabled(boolean enabled) {
             try {
                 final int userId = Binder.getCallingUserHandle().getIdentifier();