diff options
| author | 2023-06-19 15:00:34 +0000 | |
|---|---|---|
| committer | 2023-06-19 15:00:34 +0000 | |
| commit | aee1e3562f5dd152d09d4cb0e1280604bc4a597b (patch) | |
| tree | cd6c440829d9a56f542518c417a343474e37bade | |
| parent | 763dd832584dac6a67140609f37ccc44abfc5b55 (diff) | |
| parent | cf6e3b1fd6f66edd3677ef054f3b11ac84c48913 (diff) | |
Merge "Fix wrong logic in macro key handling." into udc-dev am: cf6e3b1fd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692413
Change-Id: I739aa9fc9b8350b986130ed5877f7a925e8aa467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 7 |
1 files changed, 0 insertions, 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; } |