Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I9e8c98e9acd54e6e10aaab07d6b0dcc4e7969819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nathalie Le Clair
2023-03-01 14:22:57 +00:00
committed by Automerger Merge Worker
parent f9cacad6a0 d945bd9083
commit 32e14e74c3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -700,6 +700,7 @@ public class HdmiControlService extends SystemService {
} }
if (mCecController == null) { if (mCecController == null) {
Slog.i(TAG, "Device does not support HDMI-CEC."); Slog.i(TAG, "Device does not support HDMI-CEC.");
return;
} }
if (mMhlController == null) { if (mMhlController == null) {
mMhlController = HdmiMhlControllerStub.create(this); mMhlController = HdmiMhlControllerStub.create(this);
@@ -713,9 +714,6 @@ public class HdmiControlService extends SystemService {
if (mEarcController == null) { if (mEarcController == null) {
Slog.i(TAG, "Device does not support eARC."); Slog.i(TAG, "Device does not support eARC.");
} }
if (mCecController == null && mEarcController == null) {
return;
}
mHdmiCecNetwork = new HdmiCecNetwork(this, mCecController, mMhlController); mHdmiCecNetwork = new HdmiCecNetwork(this, mCecController, mMhlController);
if (isCecControlEnabled()) { if (isCecControlEnabled()) {
initializeCec(INITIATED_BY_BOOT_UP); initializeCec(INITIATED_BY_BOOT_UP);