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

Commit d18d8e5b authored by Amy Zhang's avatar Amy Zhang Committed by android-build-merger
Browse files

Merge "Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f am:... 

Merge "Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f am: 12cb831a am: 23d8bfeb am: 602a53e4" into qt-qpr1-dev-plus-aosp
am: 2615de07

Change-Id: I19869a17b3f8245a52b76f160cb448fa4d37a635
parents b931e6f7 2615de07

services/core/java/com/android/server/hdmi/HdmiCecKeycode.java

+1 −2
Original line number Diff line number Diff line
@@ -290,8 +290,7 @@ final class HdmiCecKeycode { 
            new KeycodeEntry(KeyEvent.KEYCODE_CHANNEL_UP, CEC_KEYCODE_CHANNEL_UP),

            new KeycodeEntry(KeyEvent.KEYCODE_CHANNEL_DOWN, CEC_KEYCODE_CHANNEL_DOWN),

            new KeycodeEntry(KeyEvent.KEYCODE_LAST_CHANNEL, CEC_KEYCODE_PREVIOUS_CHANNEL),

            // No Android keycode defined for CEC_KEYCODE_SOUND_SELECT

            new KeycodeEntry(UNSUPPORTED_KEYCODE, CEC_KEYCODE_SOUND_SELECT),

            new KeycodeEntry(KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK, CEC_KEYCODE_SOUND_SELECT),

            new KeycodeEntry(KeyEvent.KEYCODE_TV_INPUT, CEC_KEYCODE_INPUT_SELECT),

            new KeycodeEntry(KeyEvent.KEYCODE_INFO, CEC_KEYCODE_DISPLAY_INFORMATION),

            // No Android keycode defined for CEC_KEYCODE_HELP