Commit dc656339 authored Nov 13, 2009 by Mike Lockwood Committed by Android Git Automerger Nov 13, 2009

am 991475a2: Merge change I0e419fcf into eclair

Merge commit '991475a2' into eclair-mr2

* commit '991475a2':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager

parents 7d7257dd 991475a2

core/java/android/os/LocalPowerManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,4 +45,6 @@ public interface LocalPowerManager {

		// the same as the method on PowerManager
		public void userActivity(long time, boolean noChangeLights, int eventType);

		boolean isScreenOn();
		}