| commit | 9e89d13906739e856ed809ba81c32415770717c6 | [log] [tgz] |
|---|---|---|
| author | Jay Patel <pateljay@google.com> | Wed Sep 04 10:53:16 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 04 10:53:16 2019 -0700 |
| tree | 78be7fa3d9855c2a536e80ed4e7360845a968791 | |
| parent | d41a61df805dbe31c4f46cf12b2c7ae4f752987a [diff] | |
| parent | 1bc876bb5b2b8506fe5e47421456c36ba4eefdea [diff] |
Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b Change-Id: If9d1bda003ca03f6579559b7d13acbadba486dcd
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index dacf372..9a85f952 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1635,6 +1635,10 @@ removeAction(SystemAudioAutoInitiationAction.class); removeAction(SystemAudioStatusAction.class); removeAction(VolumeControlAction.class); + + if (!mService.isControlEnabled()) { + setSystemAudioMode(false); + } } @ServiceThreadOnly