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

Commit f4e4eb54 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android Git Automerger
Browse files

am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low 

* commit '2ee0d6f4':
  CEC: Stop ARC if hotplug event is asserted low
parents 0cbbfb2b 2ee0d6f4

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

+13 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.hdmi.HdmiRecordSources;

import android.hardware.hdmi.HdmiTimerRecordSources;

import android.hardware.hdmi.IHdmiControlCallback;
@@ -878,6 +879,17 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        return oldStatus;

    }



    @ServiceThreadOnly

    private void updateArcFeatureStatus(int portId, boolean isConnected) {

        assertRunOnServiceThread();

        // HEAC 2.4, HEACT 5-15

        // Should not activate ARC if +5V status is false.

        HdmiPortInfo portInfo = mService.getPortInfo(portId);

        if (portInfo.isArcSupported()) {

            changeArcFeatureEnabled(isConnected);

        }

    }



    private void notifyArcStatusToAudioService(boolean enabled) {

        // Note that we don't set any name to ARC.

        mService.getAudioManager().setWiredDeviceConnectionState(
@@ -1509,6 +1521,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            // It covers seq #40, #43.

            hotplugActions.get(0).pollAllDevicesNow();

        }

        updateArcFeatureStatus(portId, connected);

    }



    private void removeCecSwitches(int portId) {