summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amy Zhang <amyjojo@google.com> 2019-07-29 14:45:25 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-29 14:45:25 -0700
commit602a53e409b2c09ca7b96f4d24c556522ecf8e97 (patch)
tree287d0fcac91668bf097d1f407694c28ee916de3b
parentd14afefca09491020110356ad84beb779e4741c7 (diff)
parent23d8bfeb80c3647b36fe66b1d18dae5256ec8015 (diff)
Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f3a am: 12cb831abe
am: 23d8bfeb80 Change-Id: I34c894a083e2c80936596a3eee48d989007005a2
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecKeycode.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
index 2c0cacdd26e5..52cede2121bd 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
@@ -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