From 4ee736c7b173ac2c3ee18be2b3720d07a981cd90 Mon Sep 17 00:00:00 2001
From: "Hannah.Hsu" <hannah.hsu@mediatek.com>
Date: Wed, 15 May 2019 15:38:28 +0800
Subject: Set SAM To Disabled On HdmiControl Disabled

Bug: 133375754

Change-Id: I2514b35429fb8a082cf74c5bb3c5fb47f16cdcc1
---
 services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 25ca27836aa7..e9538b664a8e 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1651,6 +1651,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         removeAction(SystemAudioAutoInitiationAction.class);
         removeAction(SystemAudioStatusAction.class);
         removeAction(VolumeControlAction.class);
+
+        if (!mService.isControlEnabled()) {
+            setSystemAudioMode(false);
+        }
     }
 
     @ServiceThreadOnly
-- 
cgit v1.2.3