Merge "CEC: Make wakeup on hotplug optional" into mnc-dev (dd0f3964) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,10 @@ final class Constants {
		// values which denotes the device type in HDMI Spec 1.4.
		static final String PROPERTY_DEVICE_TYPE = "ro.hdmi.device_type";

		// TODO(OEM): Set this to false to keep the playback device in sleep upon hotplug event.
		// True by default.
		static final String PROPERTY_WAKE_ON_HOTPLUG = "ro.hdmi.wake_on_hotplug";

		// Set to false to allow playback device to go to suspend mode even
		// when it's an active source. True by default.
		static final String PROPERTY_KEEP_AWAKE = "persist.sys.hdmi.keep_awake";

+4 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
		final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
		private static final String TAG = "HdmiCecLocalDevicePlayback";

		private static final boolean WAKE_ON_HOTPLUG =
		SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, true);

		private boolean mIsActiveSource = false;

		// Used to keep the device awake while it is the active source. For devices that
		@@ -130,7 +133,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
		assertRunOnServiceThread();
		mCecMessageCache.flushAll();
		// We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.
		if (connected && mService.isPowerStandbyOrTransient()) {
		if (WAKE_ON_HOTPLUG && connected && mService.isPowerStandbyOrTransient()) {
		mService.wakeUp();
		}
		if (!connected) {