diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 3563938a9c3ca..c0deb3f8274b5 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -700,6 +700,7 @@ public class HdmiControlService extends SystemService { } if (mCecController == null) { Slog.i(TAG, "Device does not support HDMI-CEC."); + return; } if (mMhlController == null) { mMhlController = HdmiMhlControllerStub.create(this); @@ -713,9 +714,6 @@ public class HdmiControlService extends SystemService { if (mEarcController == null) { Slog.i(TAG, "Device does not support eARC."); } - if (mCecController == null && mEarcController == null) { - return; - } mHdmiCecNetwork = new HdmiCecNetwork(this, mCecController, mMhlController); if (isCecControlEnabled()) { initializeCec(INITIATED_BY_BOOT_UP);