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

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

Change-Id: I55eff71dcdd37b0bd83278727e665426d20db435
This commit is contained in:
Treehugger Robot
2021-04-08 11:22:28 +00:00
committed by Automerger Merge Worker

View File

@@ -800,7 +800,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
assertRunOnServiceThread(); assertRunOnServiceThread();
if (!mService.isPowerStandbyOrTransient()) { if (!mService.isPowerStandbyOrTransient()) {
addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress())); 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)) { && !hasAction(SetArcTransmissionStateAction.class)) {
startArcAction(true); startArcAction(true);
} }