Merge "Exit dream mode on CEC wake message received" into sc-dev (ab05512e) · Commits · e / os / android_frameworks_base

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -258,18 +258,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
		return super.handleUserControlPressed(message);
		}

		@Override
		protected void wakeUpIfActiveSource() {
		if (!isActiveSource()) {
		return;
		}
		// Wake up the device if the power is in standby mode, or its screen is off -
		// which can happen if the device is holding a partial lock.
		if (mService.isPowerStandbyOrTransient() \|\| !mService.getPowerManager().isScreenOn()) {
		mService.wakeUp();
		}
		}

		@ServiceThreadOnly
		@Constants.HandleMessageResult
		protected int handleSetMenuLanguage(HdmiCecMessage message) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -372,7 +372,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
		if (!isActiveSource()) {
		return;
		}
		// Wake up the device
		// Wake up the device. This will also exit dream mode.
		mService.wakeUp();
		return;
		}