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

Commit fadaeb99 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge "Make CEC HAL support required for eARC support" into udc-dev am: d945bd90 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609323



Change-Id: I248b56c4bd45b7eed452fa2e0b62ccc5456e86c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bf552e9 d945bd90

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

+1 −3
Original line number Diff line number Diff line
@@ -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);