commit 7237cd811cd760be2daa18fb495b2e05172d5fd4
author Jungshik Jang <jayjang@google.com> Mon Jun 16 04:41:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 22:29:12 2014 +0000
tree 2b97b107b4b95947dfa5fce13ea46f8ddfb65219
parent 67ad9a4557b5456573c3ed0da7e2c78e4bfd4223
parent 60cffce420db4c3395f86d3b9bb36003adf26f5d

Merge "Refine new device action."

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiConstants.java b/services/core/java/com/android/server/hdmi/HdmiConstants.java
index 2ab87d6..b558f2b 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 @@
     // 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;

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

diff --git a/services/core/java/com/android/server/hdmi/SendKeyAction.java b/services/core/java/com/android/server/hdmi/SendKeyAction.java
index 5eb9315..8e6998f 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 @@
     // 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);
     }
 }