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

Commit 662017b9 authored by Sergej Salnikov's avatar Sergej Salnikov
Browse files

Fix wrong logic in macro key handling. 

The key should be handled by global key receiver.

Bug: 287386277
Change-Id: I066b21c53e1f030b1f4a03ef83cdebb76ee163b6
parent fa7b5d52

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;

        }