commit b3eeb859f7760785fee6d65fc0bad6ac27f7c614
author Dan Zhang <danielzhang@google.com> Thu Jun 21 02:41:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 21 02:41:59 2018 +0000
tree c8b03903c72a5915cda334670f0ded72f8cb0860
parent b773556215391c1eb15949dc48596252b9e059ae
parent 55269f757e44b25706e26977ca3f69ce079490f5

Merge "Fix <UCP>[Power] toggled the power status"

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 0cba76b..f6b032e 100755
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -514,8 +514,7 @@
     static boolean isPowerOffOrToggleCommand(HdmiCecMessage message) {
         byte[] params = message.getParams();
         return message.getOpcode() == Constants.MESSAGE_USER_CONTROL_PRESSED
-                && (params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER
-                        || params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_OFF_FUNCTION
+                && (params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_OFF_FUNCTION
                         || params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_TOGGLE_FUNCTION);
     }