commit f1eb3594a38f8ab66cc58f16f95ed9810b0080b9
author Amy Zhang <amyjojo@google.com> Wed Jul 03 20:06:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 03 20:06:08 2019 +0000
tree 029bde0b9719b64bd11b77fc8844bfef87039a1d
parent f10a78ceaf7e74e2d43ab312309e35059e44c910
parent 46ad11f02400cde471a965a3eb1521c507728c9b

Merge "Only init ARC when system audio mode is on"

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 abfd445..548553d 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -1024,7 +1024,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));
             }