From ab27ffbdb5e27ee2830f248cddb87b9d5514c33c Mon Sep 17 00:00:00 2001
From: "Kyeongkab.Nam" <Kyeongkab.Nam@sony.com>
Date: Fri, 19 Oct 2018 16:35:14 +0900
Subject: [PATCH] Fix to set physical address for IsConnectedToArcPort

"ARC_CONNECTED_INVALID_PORT" message is not displayed on correct timing
since IsConnectedToArcPort's argument was wrong.

Test: Sanity Test on Android TV.
Change-Id: I452cf6f0b89308f9319d075835f309a92b1aa793
---
 .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index de0f29851da5e..25ca27836aa7d 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 @@ 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;