Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a65aed8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix: Power key handled even if event was a cancelled event" into main

parents 48916cff 81d3f6a1

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

                }