Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b

am: 9e89d13906 Change-Id: I20534d988badea0727c66c7e2b7e94fef5b1ab88
2019-09-04 11:21:02 -07:00
parent 6b79955db4 9e89d13906
commit 00ce169055
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