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

Commit f7e816f6 authored by Kyeongkab.Nam's avatar Kyeongkab.Nam Committed by android-build-merger
Browse files

Merge "Fix to set physical address for IsConnectedToArcPort" am: 5db6efa3 

am: 6c6286f5

Change-Id: Ibc056e12bcb37ee8ac5c294d7bb12831e6cd78fc
parents fe09b5f3 6c6286f5

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

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



        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.

                mDelayedMessageBuffer.add(message);

                return true;

            }

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

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

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

                displayOsd(OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT);

            }

            return true;