commit 2a35ae262b86356248bfc49f8cee1bffae642f56
author Aran Ink <nesciosquid@google.com> Mon Apr 20 16:04:29 2020 -0400
committer android-build-team Robot <android-build-team-robot@google.com> Mon Apr 20 23:06:47 2020 +0000
tree 2f61559d7d6fc7e059769ce11f4f2c1019c500f1
parent 005af8601b14fa05addab22cbc94c950b91dc556

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
(cherry picked from commit 6560ab752dd54e5e8e6d5c756e52cd6984a522fa)

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 2c1bd21..d6df1940 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -2220,6 +2220,7 @@
                     })
                     .start();
             dismissPanel();
+            dismissOverflow();
             resetOrientation();
         }
 
@@ -2227,6 +2228,7 @@
             mShowing = false;
             if (mControlsUiController != null) mControlsUiController.hide();
             dismissPanel();
+            dismissOverflow();
             resetOrientation();
             completeDismiss();
         }
@@ -2243,6 +2245,12 @@
             }
         }
 
+        private void dismissOverflow() {
+            if (mOverflowPopup != null) {
+                mOverflowPopup.dismiss();
+            }
+        }
+
         private void setRotationSuggestionsEnabled(boolean enabled) {
             try {
                 final int userId = Binder.getCallingUserHandle().getIdentifier();