| commit | 1bc876bb5b2b8506fe5e47421456c36ba4eefdea | [log] [tgz] |
|---|---|---|
| author | Jay Patel <pateljay@google.com> | Wed Sep 04 17:25:08 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 04 17:25:08 2019 +0000 |
| tree | f712bf1e6af858a75d3c6bf29ed7f8a0f372a071 | |
| parent | 82454e029f05bf1795ac8704fb828ce9ed76767a [diff] | |
| parent | 4ee736c7b173ac2c3ee18be2b3720d07a981cd90 [diff] |
Merge "Set SAM To Disabled On HdmiControl Disabled"
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 3a6987f..cb8ca16 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1655,6 +1655,10 @@ removeAction(SystemAudioAutoInitiationAction.class); removeAction(SystemAudioStatusAction.class); removeAction(VolumeControlAction.class); + + if (!mService.isControlEnabled()) { + setSystemAudioMode(false); + } } @ServiceThreadOnly