commit 5db6efa36de5d6c10e4c22c41dc859128931d414
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 11 01:01:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 11 01:01:20 2018 +0000
tree 3aa42f3b2e556c5b2c94c05c42cb2216e140d62b
parent 69a618fb5b23d9b74443cfbdf7583241cea89f1f
parent ab27ffbdb5e27ee2830f248cddb87b9d5514c33c

Merge "Fix to set physical address for IsConnectedToArcPort"

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index de0f298..25ca278 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1082,13 +1082,14 @@
         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;