summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kyeongkab.Nam <Kyeongkab.Nam@sony.com> 2018-10-19 16:35:14 +0900
committer Kyeongkab.Nam <Kyeongkab.Nam@sony.com> 2018-10-19 16:36:02 +0900
commitab27ffbdb5e27ee2830f248cddb87b9d5514c33c (patch)
treec84a8f8fa4a4ef5ee9d13f7c9d08dc6aa692e98e
parentb65aca27af54c430ba65867bcdbff02507091af6 (diff)
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
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java5
1 files 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 de0f29851da5..25ca27836aa7 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;