| commit | 0d0de8703933548e8f942fcf66cf68df6ed97c97 | [log] [tgz] |
|---|---|---|
| author | Jay Patel <pateljay@google.com> | Wed Sep 04 12:21:56 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 04 12:21:56 2019 -0700 |
| tree | 1b89edd95f2d65ced9173f9b95849aeb55a69922 | |
| parent | 85e6ff9b7724226ad0fc237e47cf3e589db68f29 [diff] | |
| parent | 7970f36605af88aa480e21513f1a6585604063c5 [diff] |
Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b am: 9e89d13906 am: 00ce169055 am: f465d5a2bd am: 7970f36605 Change-Id: I4cfbb9a98b23ceddc327696b441288e631624f45
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