commit db61b03c23267d2687c18a4dfec1448ab5325764
author Mike Lockwood <lockwood@android.com> Mon Nov 02 11:04:41 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 02 11:04:41 2009 -0800
tree 91738196ecb1f51f6ddcac03bef432d927431078
parent 648feb772445eeaf31fcee6a020e43645411c534
parent b2346324e5f6062fed7bdeaedb9cf968b05050ec

am b2346324: am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.

Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp

* commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec':
  Do not advance mLastEventTime when enabling or disabling user activity.

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 190ba5e..f68bcbb 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2079,7 +2079,6 @@
     public void enableUserActivity(boolean enabled) {
         synchronized (mLocks) {
             mUserActivityAllowed = enabled;
-            mLastEventTime = SystemClock.uptimeMillis(); // we might need to pass this in
         }
     }