From 81d3f6a132c1194d79c02f0736d1e13be847348b Mon Sep 17 00:00:00 2001
From: Vaibhav Devmurari <vdevmurari@google.com>
Date: Tue, 17 Dec 2024 15:56:57 +0000
Subject: Fix: Power key handled even if event was a cancelled event

Bug: 358569822
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ifbd09d29290e59c5c0ab77c8a7b54451dceb2aa6
---
 services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index c4d1cc723804..ec0f25169d75 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4068,7 +4068,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     @Nullable IBinder focusedToken) {
                 boolean handled = PhoneWindowManager.this.handleKeyGestureEvent(event,
                         focusedToken);
-                if (handled && Arrays.stream(event.getKeycodes()).anyMatch(
+                if (handled && !event.isCancelled() && Arrays.stream(event.getKeycodes()).anyMatch(
                         (keycode) -> keycode == KeyEvent.KEYCODE_POWER)) {
                     mPowerKeyHandled = true;
                 }
-- 
cgit v1.2.3-59-g8ed1b