summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amy Zhang <amyjojo@google.com> 2019-07-29 15:27:42 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-29 15:27:42 -0700
commitc2561694a8656826ac264cacdd43a1b94a59dec9 (patch)
tree80db0a86d2c43cd58921e3b9bf7bc1ad07c95c2e
parentb2328f836664298d513d4cbfee79fe2a29657c18 (diff)
parent602a53e409b2c09ca7b96f4d24c556522ecf8e97 (diff)
Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f3a am: 12cb831abe am: 23d8bfeb80
am: 602a53e409 Change-Id: I9ddb2681b1569ee79a24c81e0c281ff8cebf48cc
-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