summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author daren.liao <daren.liao@mediatek.com> 2020-05-19 14:15:00 +0800
committer Robin Lee <rgl@google.com> 2020-06-09 09:34:00 +0000
commit4fdd39bc41cc96dc64fc01102d36c4ea5b563f88 (patch)
treedfa1f250d546042ad719437b5d3b7a6649340939
parentb1b131a59531764c9c12e01ea326c0d35066a18f (diff)
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)
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index d0bd635c2255..87b0a3975ae8 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);