Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1867d61 authored by Dan Zhang's avatar Dan Zhang Committed by android-build-merger
Browse files

Merge "Fix <UCP>[Power] toggled the power status" am: b3eeb859 am: 26f781db 

am: 016dff40

Change-Id: Iae4a06954f780fc18c9089cf42e2802d958a9ce4
parents fbfc653c 016dff40

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -516,8 +516,7 @@ abstract class HdmiCecLocalDevice { 
    static boolean isPowerOffOrToggleCommand(HdmiCecMessage message) {

    static boolean isPowerOffOrToggleCommand(HdmiCecMessage message) {

        byte[] params = message.getParams();

        byte[] params = message.getParams();

        return message.getOpcode() == Constants.MESSAGE_USER_CONTROL_PRESSED

        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);

                        || params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_TOGGLE_FUNCTION);

    }

    }