Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix to set physical address for IsConnectedToArcPort"

Browse Source
This commit is contained in:
Treehugger Robot
2018-12-11 01:01:20 +00:00
committed by Gerrit Code Review
parent 69a618fb5b ab27ffbdb5
commit 5db6efa36d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -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;