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

Commit 6f447e1e authored by Hongguang Chen's avatar Hongguang Chen
Browse files

Send TV direct keys to global key handler to handle 

The TV direct keys added by ag/15936307 should be sent to global key handler to handle, which is handled at the end of
interceptSystemKeysAndShortcuts().

Bug: 349753425
Flag: EXEMPT bugfix
Test: manual test
Test: atest KeyEventInterceptTest
Change-Id: I69fb930f6735e94330f1c16694f67430952cd583
parent 6c80fde9

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

+0 −18
Original line number Diff line number Diff line
@@ -3568,24 +3568,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                Slog.wtf(TAG, "KEYCODE_VOICE_ASSIST should be handled in"

                        + " interceptKeyBeforeQueueing");

                return true;

            case KeyEvent.KEYCODE_VIDEO_APP_1:

            case KeyEvent.KEYCODE_VIDEO_APP_2:

            case KeyEvent.KEYCODE_VIDEO_APP_3:

            case KeyEvent.KEYCODE_VIDEO_APP_4:

            case KeyEvent.KEYCODE_VIDEO_APP_5:

            case KeyEvent.KEYCODE_VIDEO_APP_6:

            case KeyEvent.KEYCODE_VIDEO_APP_7:

            case KeyEvent.KEYCODE_VIDEO_APP_8:

            case KeyEvent.KEYCODE_FEATURED_APP_1:

            case KeyEvent.KEYCODE_FEATURED_APP_2:

            case KeyEvent.KEYCODE_FEATURED_APP_3:

            case KeyEvent.KEYCODE_FEATURED_APP_4:

            case KeyEvent.KEYCODE_DEMO_APP_1:

            case KeyEvent.KEYCODE_DEMO_APP_2:

            case KeyEvent.KEYCODE_DEMO_APP_3:

            case KeyEvent.KEYCODE_DEMO_APP_4:

                Slog.wtf(TAG, "KEYCODE_APP_X should be handled in interceptKeyBeforeQueueing");

                return true;

            case KeyEvent.KEYCODE_BRIGHTNESS_UP:

            case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:

                if (down) {