Merge "CEC: Check port id for ARC status update on hotplug"

    @ServiceThreadOnly

    private void updateArcFeatureStatus(int portId, boolean isConnected) {

        assertRunOnServiceThread();

        HdmiDeviceInfo avr = getAvrDeviceInfo();

        if (avr == null) {

            return;

        }

        // HEAC 2.4, HEACT 5-15

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

        HdmiPortInfo portInfo = mService.getPortInfo(portId);

        if (portInfo.isArcSupported()) {

        if (avr.getPortId() == portId && portInfo.isArcSupported()) {

            changeArcFeatureEnabled(portId, isConnected);

        }

    }