Merge "Disable ARC when physical address is incorrect" am: 27cdbf8a25 am: 1eca3d7321 am: 2c31fa42cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313812

Change-Id: I16a0a0f4731221df786a17311e713f71a2a0bd9f
This commit is contained in:
Treehugger Robot
2021-04-08 12:32:13 +00:00
committed by Automerger Merge Worker

View File

@@ -713,7 +713,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
assertRunOnServiceThread();
if (!mService.isPowerStandbyOrTransient()) {
addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));
if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId())
if (!isDirectConnectAddress(avr.getPhysicalAddress())) {
startArcAction(false);
} else if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId())
&& !hasAction(SetArcTransmissionStateAction.class)) {
startArcAction(true);
}