Merge "Set SAM To Disabled On HdmiControl Disabled"

2019-09-04 17:25:08 +00:00
parent 82454e029f 4ee736c7b1
commit 1bc876bb5b
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
@@ -1655,6 +1655,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
        removeAction(SystemAudioAutoInitiationAction.class);
        removeAction(SystemAudioStatusAction.class);
        removeAction(VolumeControlAction.class);
+
+        if (!mService.isControlEnabled()) {
+            setSystemAudioMode(false);
+        }
    }

    @ServiceThreadOnly