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

Commit 5db6efa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix to set physical address for IsConnectedToArcPort"

parents 69a618fb ab27ffbd

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -1082,13 +1082,14 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        assertRunOnServiceThread();

        assertRunOnServiceThread();





        if (!canStartArcUpdateAction(message.getSource(), true)) {

        if (!canStartArcUpdateAction(message.getSource(), true)) {

            if (getAvrDeviceInfo() == null) {

            HdmiDeviceInfo avrDeviceInfo = getAvrDeviceInfo();

            if (avrDeviceInfo == null) {

                // AVR may not have been discovered yet. Delay the message processing.

                // AVR may not have been discovered yet. Delay the message processing.

                mDelayedMessageBuffer.add(message);

                mDelayedMessageBuffer.add(message);

                return true;

                return true;

            }

            }

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            if (!isConnectedToArcPort(message.getSource())) {

            if (!isConnectedToArcPort(avrDeviceInfo.getPhysicalAddress())) {

                displayOsd(OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT);

                displayOsd(OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT);

            }

            }

            return true;

            return true;