From 47e5023eea23957933fe9bc683045c3e3f06f784 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Fri, 13 Nov 2009 18:06:22 -0500
Subject: [PATCH] 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>
---
 policy/com/android/internal/policy/impl/PhoneWindowManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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