commit 46ad11f02400cde471a965a3eb1521c507728c9b
author Amy <amyjojo@google.com> Mon Jun 03 16:59:01 2019 -0700
committer Amy Zhang <amyjojo@google.com> Tue Jul 02 20:00:36 2019 +0000
tree d19a7c2e5b9079594be237c763f1bceb40846155
parent 32515e5fecac3ffdcd5338868353db2b0bfcea36

Only init ARC when system audio mode is on

Test: manual
Bug: 115756006
Change-Id: If4948ff1bc204f29fe1850222c223ea795e3e2f7
(cherry picked from commit 120207ec044795017c89ca8183898095d233fa72)

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index f9ef398..0e47b3f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -933,7 +933,7 @@
         // Init arc whenever System Audio Mode is on
         // Since some TVs don't request ARC on with System Audio Mode on request
         if (SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)
-                && isDirectConnectToTv()) {
+                && isDirectConnectToTv() && mService.isSystemAudioActivated()) {
             if (!hasAction(ArcInitiationActionFromAvr.class)) {
                 addAndStartAction(new ArcInitiationActionFromAvr(this));
             }