diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 14:42:25 -0500 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 14:42:25 -0500 |
| commit | 989b76aadd92538c7ab4ca00c34508b42fda8cef (patch) | |
| tree | 3ba6320738a0ba7392c7f896de0611641ef4f613 | |
| parent | b6a6791f381691d4a58fe6972eb9f0b65308ac1f (diff) | |
| parent | 952211b4ae8fa8cd626ae5a077b87924f35e0081 (diff) | |
| download | frameworks_base-989b76aadd92538c7ab4ca00c34508b42fda8cef.zip frameworks_base-989b76aadd92538c7ab4ca00c34508b42fda8cef.tar.gz frameworks_base-989b76aadd92538c7ab4ca00c34508b42fda8cef.tar.bz2 | |
Merge change Ieca126e6 into eclair
* changes:
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
| -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); |