Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b am: 9e89d13906 am: 00ce169055 am: f465d5a2bd

am: 7970f36605 Change-Id: I4cfbb9a98b23ceddc327696b441288e631624f45
2019-09-04 12:21:56 -07:00
parent 85e6ff9b77 7970f36605
commit 0d0de87039
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