From 662017b98ee93c678db5947029fd6987b7fb1591 Mon Sep 17 00:00:00 2001 From: Sergej Salnikov Date: Wed, 14 Jun 2023 13:09:21 +0000 Subject: Fix wrong logic in macro key handling. The key should be handled by global key receiver. Bug: 287386277 Change-Id: I066b21c53e1f030b1f4a03ef83cdebb76ee163b6 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 3e81f465a6c2..3132c5d713e3 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3272,12 +3272,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { Slog.wtf(TAG, "KEYCODE_STYLUS_BUTTON_* should be handled in" + " interceptKeyBeforeQueueing"); return key_consumed; - case KeyEvent.KEYCODE_MACRO_1: - case KeyEvent.KEYCODE_MACRO_2: - case KeyEvent.KEYCODE_MACRO_3: - case KeyEvent.KEYCODE_MACRO_4: - Slog.wtf(TAG, "KEYCODE_MACRO_x should be handled in interceptKeyBeforeQueueing"); - return key_consumed; } if (isValidGlobalKey(keyCode) @@ -4427,7 +4421,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_MACRO_2: case KeyEvent.KEYCODE_MACRO_3: case KeyEvent.KEYCODE_MACRO_4: - // TODO(b/266098478): Add logic to handle KEYCODE_MACROx feature result &= ~ACTION_PASS_TO_USER; break; } -- cgit v1.2.3-59-g8ed1b