Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix wrong logic in macro key handling." into udc-dev am: cf6e3b1fd6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692413

Change-Id: If18f40dc32559dd4bda06930ed21a21d83fed495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sergej Salnikov
2023-06-19 15:00:55 +00:00
committed by Automerger Merge Worker
parent adc34ff4ac cf6e3b1fd6
commit 0581b98a75
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3272,12 +3272,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Slog.wtf(TAG, "KEYCODE_STYLUS_BUTTON_* should be handled in" Slog.wtf(TAG, "KEYCODE_STYLUS_BUTTON_* should be handled in"
+ " interceptKeyBeforeQueueing"); + " interceptKeyBeforeQueueing");
return key_consumed; 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) if (isValidGlobalKey(keyCode)
@@ -4427,7 +4421,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_MACRO_2: case KeyEvent.KEYCODE_MACRO_2:
case KeyEvent.KEYCODE_MACRO_3: case KeyEvent.KEYCODE_MACRO_3:
case KeyEvent.KEYCODE_MACRO_4: case KeyEvent.KEYCODE_MACRO_4:
// TODO(b/266098478): Add logic to handle KEYCODE_MACROx feature
result &= ~ACTION_PASS_TO_USER; result &= ~ACTION_PASS_TO_USER;
break; break;
} }