summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Zhang <danielzhang@google.com> 2018-06-21 02:41:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-06-21 02:41:59 +0000
commitb3eeb859f7760785fee6d65fc0bad6ac27f7c614 (patch)
treec8b03903c72a5915cda334670f0ded72f8cb0860
parentb773556215391c1eb15949dc48596252b9e059ae (diff)
parent55269f757e44b25706e26977ca3f69ce079490f5 (diff)
Merge "Fix <UCP>[Power] toggled the power status"
-rwxr-xr-xservices/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 0cba76ba7346..f6b032ede5be 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 @@ abstract class HdmiCecLocalDevice {
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);
}