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.

1 files changed, 0 insertions, 1 deletions

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