Merge "Set SAM To Disabled On HdmiControl Disabled"

am: 1bc876bb5b Change-Id: If9d1bda003ca03f6579559b7d13acbadba486dcd
2019-09-04 10:53:16 -07:00
parent d41a61df80 1bc876bb5b
commit 9e89d13906
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1635,6 +1635,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
        removeAction(SystemAudioAutoInitiationAction.class);
        removeAction(SystemAudioStatusAction.class);
        removeAction(VolumeControlAction.class);
+
+        if (!mService.isControlEnabled()) {
+            setSystemAudioMode(false);
+        }
    }

    @ServiceThreadOnly