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

Merge "HDMI: Fix comment about eARC disabling and pending ARC." into udc-dev am: 91e4b9de52

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

Change-Id: Ib15b6748119ffddb8ccd9a612dddf0edabbf0f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Colța
2023-05-25 10:30:27 +00:00
committed by Automerger Merge Worker
parent ba5d522a63 91e4b9de52
commit bc8fa8c215
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4725,13 +4725,11 @@ public class HdmiControlService extends SystemService {
Slog.w(TAG, "Tried to update eARC status on a port that doesn't support eARC."); Slog.w(TAG, "Tried to update eARC status on a port that doesn't support eARC.");
return; return;
} }
// If eARC is disabled, the local device is null. In this case, the HAL shouldn't have
// reported connection state changes, but even if it did, it won't take effect.
if (mEarcLocalDevice != null) { if (mEarcLocalDevice != null) {
mEarcLocalDevice.handleEarcStateChange(status); mEarcLocalDevice.handleEarcStateChange(status);
} else if (status == HDMI_EARC_STATUS_ARC_PENDING) { } else if (status == HDMI_EARC_STATUS_ARC_PENDING) {
// If the local device is null we notify the Audio Service that eARC connection // If eARC is disabled, the local device is null. This is why we notify
// is disabled. // AudioService here that the eARC connection is terminated.
notifyEarcStatusToAudioService(false, new ArrayList<>()); notifyEarcStatusToAudioService(false, new ArrayList<>());
startArcAction(true, null); startArcAction(true, null);
} }