am ca57c7a2: am 28d2c230: am 1d697192: Merge change Icdb3d036 into eclair

Merge commit 'ca57c7a2d8f03dbc12c0bca50e008140eb7b3236'

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

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);
         }