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

Commit 90900a22 authored by Paul Colța's avatar Paul Colța Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I031d74a2f2d1ce21b3cdd7e459b717c305923f07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2cf3c7ff bc8fa8c2

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

+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);

        }