commit dc6563393789e90d75b44b9ce97c167863bf0771
author Mike Lockwood <lockwood@android.com> Fri Nov 13 15:21:45 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 13 15:21:45 2009 -0800
tree 8b481771419df96837e22288b9297907edd4f106
parent 7d7257dd9cbe38453678f2803032e283a0344424
parent 991475a2e5dcb344299387521b52fb637d6b1e4d

am 991475a2: Merge change I0e419fcf into eclair

Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2

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

core/java/android/os/LocalPowerManager.java

diff --git a/core/java/android/os/LocalPowerManager.java b/core/java/android/os/LocalPowerManager.java
index 2c6b29a..3fe21d9 100644
--- a/core/java/android/os/LocalPowerManager.java
+++ b/core/java/android/os/LocalPowerManager.java
@@ -45,4 +45,6 @@
 
     // the same as the method on PowerManager
     public void userActivity(long time, boolean noChangeLights, int eventType);
+
+    boolean isScreenOn();
 }