diff options
| author | 2021-04-08 11:22:28 +0000 | |
|---|---|---|
| committer | 2021-04-08 11:22:28 +0000 | |
| commit | 2c31fa42cbb99f5ad0b2b145ba24cf2d0fc7ecd8 (patch) | |
| tree | 0e2acca76257adbc2c6005e7d39a55e48a44795b | |
| parent | eed7191d86a80cae78992d69b31bd17fdca78a39 (diff) | |
| parent | 1eca3d7321b562d3930ad01923f811476797c8d2 (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 58a702527e5f..8bb5204ee083 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -800,7 +800,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); } |