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

Commit 0581b98a authored by Sergej Salnikov's avatar Sergej Salnikov Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If18f40dc32559dd4bda06930ed21a21d83fed495
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adc34ff4 cf6e3b1f

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

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

        }