Merge "Invoke One Touch Play on wakeUp for HDMI playback devices" into rvc-dev am: a018ca00cf (19cfbd2b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -4468,12 +4468,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private void wakeUpFromPowerKey(long eventTime) {
		wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey,
		PowerManager.WAKE_REASON_POWER_BUTTON, "android.policy:POWER");

		// Turn on the connected TV and switch HDMI input if we're a HDMI playback device.
		final HdmiControl hdmiControl = getHdmiControl();
		if (hdmiControl != null) {
		hdmiControl.turnOnTv();
		}
		}

		private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, @WakeReason int reason,
		@@ -4489,6 +4483,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		mPowerManager.wakeUp(wakeTime, reason, details);

		// Turn on the connected TV and switch HDMI input if we're a HDMI playback device.
		final HdmiControl hdmiControl = getHdmiControl();
		if (hdmiControl != null) {
		hdmiControl.turnOnTv();
		}
		return true;
		}