From 4fdd39bc41cc96dc64fc01102d36c4ea5b563f88 Mon Sep 17 00:00:00 2001
From: "daren.liao" <daren.liao@mediatek.com>
Date: Tue, 19 May 2020 14:15:00 +0800
Subject: [PATCH] Call setArcStatus(false) before standby

[Description]
DisableDevice is called before standby.
If clearDeviceInfoList() is called before <Terminate ARC> is received,
CEC can't get device info & portId of AVR
And thus enableAudioReturnChannel is not success.

Therefore, we call setArcStatus(false) earlier
before RequestArcTerminationAction and receives <Terminate ARC>

Note that we don't use SetArcTransmissionStateAction since it is not
safe to create too many Actions during standby process

Bug: 137344668
Test: OEM

Change-Id: Ic67b31ce7d9b1dc0c3c578f87fdd782fcc797d3e
(cherry picked from commit 5681bcd4ea6c9610aa931d8c536ca15c8753eae4)
---
 .../core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index d0bd635c22559..87b0a3975ae8f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1666,6 +1666,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         if (avr == null) {
             return;
         }
+        setArcStatus(false);
 
         // Seq #44.
         removeAction(RequestArcInitiationAction.class);