From db18c3b2641e23349f71103c43132f1e46d99e2c Mon Sep 17 00:00:00 2001 From: "Hannah.Hsu" Date: Wed, 15 May 2019 15:05:23 +0800 Subject: [PATCH] Fix AVR compatibility. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not to start ARC action if ARC has been already established It’s a device compatibility issue happened with Sony amplifier str-dn860. Occasionally ARC won’t be able to be established after connect the amplifier to TV through HDMI ARC. Bug: 133329521 Test: n/a Cherry pick from AOSP CL https://android-review.googlesource.com/c/platform/frameworks/base/+/968226 Change-Id: I857e2457cb682e810a940b0698d4bb635bebd1de --- .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 8a7051f0e7363..dacf372e4f936 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -832,7 +832,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { mService.setSystemAudioActivated(on); mService.announceSystemAudioModeChange(on); } - startArcAction(on); + if (on && !mArcEstablished) { + startArcAction(true); + } else if (!on) { + startArcAction(false); + } } }