From 55269f757e44b25706e26977ca3f69ce079490f5 Mon Sep 17 00:00:00 2001
From: "Shuichi.Noguchi" <Shuichi.Noguchi@jp.sony.com>
Date: Sat, 13 Jan 2018 23:59:19 +0900
Subject: [PATCH] Fix <UCP>[Power] toggled the power status

When Tv receives <Text View On>, <Active Source>, and <UCP>[Power] from
the connected device to start "One Touch Play",
TV goes to turn off and fail to OTP.
Because TV deals with the <UCP>[Power] as toggle command.

To change the behavior for <UCP>[Power] command as wake up key during
standby state or transient state.

Test: Sanity Test on Android TV. Try OTP from specific device
which sends <Text View On>, <Active Source>, and <UCP>[Power].

Change-Id: I22ce5277758535a1b63b8445b395899f15b945ef
---
 .../core/java/com/android/server/hdmi/HdmiCecLocalDevice.java  | 3 +--
 1 file changed, 1 insertion(+), 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 e5f4282eefe0d..fb8f694e87752 100644
--- 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);
     }