Set SAM To Disabled On HdmiControl Disabled

Bug: 133375754 Change-Id: I2514b35429fb8a082cf74c5bb3c5fb47f16cdcc1
2019-05-15 15:38:28 +08:00
parent 2b0582e2e6
commit 4ee736c7b1
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
@@ -1651,6 +1651,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
        removeAction(SystemAudioAutoInitiationAction.class);
        removeAction(SystemAudioStatusAction.class);
        removeAction(VolumeControlAction.class);
+
+        if (!mService.isControlEnabled()) {
+            setSystemAudioMode(false);
+        }
    }

    @ServiceThreadOnly