diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-02 12:01:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 12:01:32 -0800 |
| commit | a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb (patch) | |
| tree | e9f2f6b525c354edbf7a55b3cb783cd1845df53a /services | |
| parent | 50bb2643a5cb28c4e013eceb15c23288c85e0350 (diff) | |
| parent | e94261b874b7d0704dade14540dbb9477a828163 (diff) | |
| download | frameworks_base-a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb.zip frameworks_base-a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb.tar.gz frameworks_base-a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb.tar.bz2 | |
am e94261b8: am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit 'e94261b874b7d0704dade14540dbb9477a828163' into eclair-mr2-plus-aosp
* commit 'e94261b874b7d0704dade14540dbb9477a828163':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index f68bcbb..8a7c28f 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -1803,6 +1803,8 @@ class PowerManagerService extends IPowerManager.Stub } private void forceUserActivityLocked() { + // cancel animation so userActivity will succeed + mScreenBrightness.animating = false; boolean savedActivityAllowed = mUserActivityAllowed; mUserActivityAllowed = true; userActivity(SystemClock.uptimeMillis(), false); |