Merge "Set SAM To Disabled On HdmiControl Disabled"

am: 1bc876bb5b

Change-Id: If9d1bda003ca03f6579559b7d13acbadba486dcd
This commit is contained in:
Jay Patel
2019-09-04 10:53:16 -07:00
committed by android-build-merger

View File

@@ -1635,6 +1635,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
removeAction(SystemAudioAutoInitiationAction.class); removeAction(SystemAudioAutoInitiationAction.class);
removeAction(SystemAudioStatusAction.class); removeAction(SystemAudioStatusAction.class);
removeAction(VolumeControlAction.class); removeAction(VolumeControlAction.class);
if (!mService.isControlEnabled()) {
setSystemAudioMode(false);
}
} }
@ServiceThreadOnly @ServiceThreadOnly