commit ebe8ba9294ca5b257819ede7a8caa0eda3c8881e
author Mike Lockwood <lockwood@android.com> Fri Nov 13 18:06:22 2009 -0500
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Nov 13 16:24:37 2009 -0800
tree 6993c4f2b629937a355ac9da2351f666368b3c8c
parent 96757ff1498345bef8735791da1ca147b2247f13

Don't trigger user activity in screenOnStoppedLw() if the screen is off.

Fixes b/2260437 (device wakes itself back up when camera is last application running)

Change-Id: Icdb3d0369df752a3838fa8e58c7a4bb08efe00a6
Signed-off-by: Mike Lockwood <lockwood@android.com>

phone/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index e57fbe8..3f97661 100755
--- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2221,7 +2221,7 @@
     }
     
     public void screenOnStoppedLw() {
-        if (!mKeyguardMediator.isShowing()) {
+        if (!mKeyguardMediator.isShowing() && mPowerManager.isScreenOn()) {
             long curTime = SystemClock.uptimeMillis();
             mPowerManager.userActivity(curTime, false, LocalPowerManager.OTHER_EVENT);
         }