Make CEC HAL support required for eARC support

Reason is that the eARC implementation requires methods from the HDMI
Connection HAL, which currently enters the framework through
HdmiCecController. We may split this out in the future, but with the
current implementation, eARC cannot be supported if CEC is not
supported. Not that eARC can still work if the CEC setting is
*disabled*.

Test: make and atest
Bug: 240388106
Change-Id: Ie025c60c27e9bcc227d082e19782c674c7d7ad8b
This commit is contained in:
Nathalie Le Clair
2023-02-24 15:47:36 +01:00
parent 236f36de43
commit 8b14b52d3e

View File

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