From 5e8801cc8b9c6006c64d3962a074136308941343 Mon Sep 17 00:00:00 2001
From: Robert Snoeberger <snoeberger@google.com>
Date: Fri, 8 May 2020 20:39:12 +0000
Subject: [PATCH] Revert "Don't show global actions if already handled"

This reverts commit 62b08743c624b0d80d69dcbde2820d4af4708cf6.

Reason for revert: The tests are failing consistently now, not just flaking. The problem is that `adb shell input keyevent --longpress 26` doesn't open global actions dialog after a reboot. After the dialog has been opened the first time, it will start working.

Change-Id: I32faba89d19b24bc4141cc9bb56abffb70aeb52f
Bug: 156037650
---
 .../com/android/server/policy/PhoneWindowManager.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 3bc151af35895..2f84a99774f4b 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1222,12 +1222,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             case LONG_PRESS_POWER_NOTHING:
                 break;
             case LONG_PRESS_POWER_GLOBAL_ACTIONS:
-                if (!mPowerKeyHandled) {
-                    mPowerKeyHandled = true;
-                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
-                            "Power - Long Press - Global Actions");
-                    showGlobalActionsInternal();
-                }
+                mPowerKeyHandled = true;
+                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
+                        "Power - Long Press - Global Actions");
+                showGlobalActionsInternal();
                 break;
             case LONG_PRESS_POWER_SHUT_OFF:
             case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: