From f1d14f6a33bc6086db52a77b6a1217452b7eac90 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 2 Nov 2009 11:56:04 -0500 Subject: [PATCH] Do not advance mLastEventTime when enabling or disabling user activity. Fixes a race condition between the keyguard and power key that sometimes resulted in the power key failing to turn off the screen. Fixes bug b/2212852 (Power button does not put phone to sleep) Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e Signed-off-by: Mike Lockwood --- services/java/com/android/server/PowerManagerService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 190ba5e075075..f68bcbbcb7346 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 } }