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

Commit 99efe8fc authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "HDMI: Fix comment about eARC disabling and pending ARC." into...

Merge "Merge "HDMI: Fix comment about eARC disabling and pending ARC." into udc-dev am: 91e4b9de am: 120558ec am: 1a097fc3" into udc-qpr-dev-plus-aosp
parents 2ff2d021 c75834e3
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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);
        }