From 452541739d1961a68a4cbe9b27392b802374b413 Mon Sep 17 00:00:00 2001
From: "Hannah.Hsu" <hannah.hsu@mediatek.com>
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

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 25ca27836aa7d..3a6987fc352fe 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -850,7 +850,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
                 mSystemAudioActivated = on;
                 mService.announceSystemAudioModeChange(on);
             }
-            startArcAction(on);
+            if (on && !mArcEstablished) {
+                startArcAction(true);
+            } else if (!on) {
+                startArcAction(false);
+            }
         }
     }