diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 440676a3ae8f8..df4674c958b02 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1498,6 +1498,11 @@ public class HdmiControlService extends SystemService { Slog.e(TAG, "Callback cannot be null"); return; } + if (isPowerStandby()) { + Slog.e(TAG, "Device is in standby. Not handling deviceSelect"); + invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE); + return; + } HdmiCecLocalDeviceTv tv = tv(); if (tv == null) { if (!mAddressAllocated) { @@ -1540,6 +1545,11 @@ public class HdmiControlService extends SystemService { Slog.e(TAG, "Callback cannot be null"); return; } + if (isPowerStandby()) { + Slog.e(TAG, "Device is in standby. Not handling portSelect"); + invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE); + return; + } HdmiCecLocalDeviceTv tv = tv(); if (tv != null) { tv.doManualPortSwitching(portId, callback);