summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Colța <donpaul@google.com> 2023-05-25 10:30:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-25 10:30:27 +0000
commitbc8fa8c2154614c30f064510a602a64affbd8c86 (patch)
tree4e8ba135ef010d3f66aaa59dbfb03f1856b548b7
parentba5d522a63771bac75fa979ca66f8f8912c73f2e (diff)
parent91e4b9de523fa389be6a4c1977582e207fb5cef8 (diff)
Merge "HDMI: Fix comment about eARC disabling and pending ARC." into udc-dev am: 91e4b9de52
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>
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiControlService.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index be9df4aecf43..2c54e1cea3fa 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -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.");
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) {
mEarcLocalDevice.handleEarcStateChange(status);
} else if (status == HDMI_EARC_STATUS_ARC_PENDING) {
- // If the local device is null we notify the Audio Service that eARC connection
- // is disabled.
+ // If eARC is disabled, the local device is null. This is why we notify
+ // AudioService here that the eARC connection is terminated.
notifyEarcStatusToAudioService(false, new ArrayList<>());
startArcAction(true, null);
}