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

Merge "Change checking rule in startArcAction(false) for HDMI CTS" am: 3adddd63a7 am: 10d8d7109f am: d5c6dffae6 am: 997d3b5e53

Browse Source 
Change-Id: I6b43ba15eb2c4d0df116c3db55441b6edcd55d35
This commit is contained in:
Automerger Merge Worker
2020-02-25 09:10:26 +00:00
parent a6d94484d2 997d3b5e53
commit 33170b2a93
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1092,10 +1092,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
HdmiDeviceInfo avr = getAvrDeviceInfo(); HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr != null if (avr != null
&& (avrAddress == avr.getLogicalAddress()) && (avrAddress == avr.getLogicalAddress())
&& isConnectedToArcPort(avr.getPhysicalAddress()) && isConnectedToArcPort(avr.getPhysicalAddress())) {
&& isDirectConnectAddress(avr.getPhysicalAddress())) {
if (enabled) { if (enabled) {
return isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId()); return isConnected(avr.getPortId())
&& isArcFeatureEnabled(avr.getPortId())
&& isDirectConnectAddress(avr.getPhysicalAddress());
} else { } else {
return true; return true;
} }