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

Browse Source 
Change-Id: Ic503411c200d2c740a21e388372cb16b99e5141f
This commit is contained in:
Automerger Merge Worker
2020-02-25 08:41:48 +00:00
parent 2e73fa4607 10d8d7109f
commit d5c6dffae6
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();
if (avr != null
&& (avrAddress == avr.getLogicalAddress())
&& isConnectedToArcPort(avr.getPhysicalAddress())
&& isDirectConnectAddress(avr.getPhysicalAddress())) {
&& isConnectedToArcPort(avr.getPhysicalAddress())) {
if (enabled) {
return isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId());
return isConnected(avr.getPortId())
&& isArcFeatureEnabled(avr.getPortId())
&& isDirectConnectAddress(avr.getPhysicalAddress());
} else {
return true;
}