Merge "Set SAM false when the AVR is standby to prevent reawaken the AVR" (e9de3add) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1557,6 +1557,18 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		if (!connected) {
		removeCecSwitches(portId);
		}

		// Turning System Audio Mode off when the AVR is unlugged or standby.
		// When the device is not unplugged but reawaken from standby, we check if the System
		// Audio Control Feature is enabled or not then decide if turning SAM on/off accordingly.
		if (getAvrDeviceInfo() != null && portId == getAvrDeviceInfo().getPortId()) {
		if (!connected) {
		setSystemAudioMode(false);
		} else if (mSystemAudioControlFeatureEnabled != mService.isSystemAudioActivated()){
		setSystemAudioMode(mSystemAudioControlFeatureEnabled);
		}
		}

		// Tv device will have permanent HotplugDetectionAction.
		List<HotplugDetectionAction> hotplugActions = getActions(HotplugDetectionAction.class);
		if (!hotplugActions.isEmpty()) {