From 67ad9a4557b5456573c3ed0da7e2c78e4bfd4223 Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Mon, 16 Jun 2014 08:07:45 +0900 Subject: [PATCH] Use android-cec key conversion in HdmiControlService.sendKeyAction Change-Id: I8395d0217e2bbcd2cd6148414be8bcde1db168c0 --- services/core/java/com/android/server/hdmi/HdmiConstants.java | 2 ++ services/core/java/com/android/server/hdmi/SendKeyAction.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiConstants.java b/services/core/java/com/android/server/hdmi/HdmiConstants.java index 8f319ea9c02c4..8a2dd2a180eab 100644 --- a/services/core/java/com/android/server/hdmi/HdmiConstants.java +++ b/services/core/java/com/android/server/hdmi/HdmiConstants.java @@ -40,6 +40,8 @@ final class HdmiConstants { // Constants related to UI Command Codes. // Refer to CEC Table 30 in HDMI Spec v1.4b. static final int UI_COMMAND_POWER = 0x40; + static final int UI_COMMAND_VOLUME_UP = 0x41; + static final int UI_COMMAND_VOLUME_DOWN = 0x42; static final int UI_COMMAND_MUTE = 0x43; static final int UI_COMMAND_MUTE_FUNCTION = 0x65; static final int UI_COMMAND_RESTORE_VOLUME_FUNCTION = 0x66; diff --git a/services/core/java/com/android/server/hdmi/SendKeyAction.java b/services/core/java/com/android/server/hdmi/SendKeyAction.java index 5eb93154fb733..8e6998ff225f9 100644 --- a/services/core/java/com/android/server/hdmi/SendKeyAction.java +++ b/services/core/java/com/android/server/hdmi/SendKeyAction.java @@ -146,8 +146,6 @@ final class SendKeyAction extends FeatureAction { // KeyEvent.KEYCODE_TV_BROADCAST_CABLE. // The return byte array contains both UI command (keycode) and optional parameter. private byte[] getCecKeyCodeAndParam(int keyCode) { - // TODO: Convert to CEC keycode and (optionally) parameter. - // return androidKeyToCecKey(keyCode); - return EmptyArray.BYTE; + return HdmiCecKeycodeTranslator.androidKeyToCecKey(keyCode); } }