diff --git a/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java b/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java index 1e29fd6e4ff45..fd7a7f9a887ac 100644 --- a/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java +++ b/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java @@ -64,10 +64,11 @@ public class PowerStatusMonitorAction extends HdmiCecFeatureAction { @Override boolean processCommand(HdmiCecMessage cmd) { - if (mState != STATE_WAIT_FOR_REPORT_POWER_STATUS) { - return false; + if (mState == STATE_WAIT_FOR_REPORT_POWER_STATUS + && cmd.getOpcode() == Constants.MESSAGE_REPORT_POWER_STATUS) { + return handleReportPowerStatus(cmd); } - return handleReportPowerStatus(cmd); + return false; } private boolean handleReportPowerStatus(HdmiCecMessage cmd) {