diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-09-05 13:39:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@cyanogenmod.teamdouche.net> | 2010-09-05 13:39:55 +0000 |
| commit | 36470be67d07b37cbb618b0e6a8d2b28ef7b2d9f (patch) | |
| tree | 0af25bf7c48b3c7c5828ed561536dcc684695196 | |
| parent | e080c01b997a55e2fe85c01a3374a23165b7adb8 (diff) | |
| parent | 4be257e00f144b2cd6c920cb1d1f3aff0e8f3185 (diff) | |
| download | frameworks_base-36470be67d07b37cbb618b0e6a8d2b28ef7b2d9f.zip frameworks_base-36470be67d07b37cbb618b0e6a8d2b28ef7b2d9f.tar.gz frameworks_base-36470be67d07b37cbb618b0e6a8d2b28ef7b2d9f.tar.bz2 | |
Merge "Prevent key dispatch ANR on rapid change of orientation." into froyo
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index d8c8cae..7d0898b 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5800,6 +5800,8 @@ public class WindowManagerService extends IWindowManager.Stub // timeout checks from now; otherwise look at whether we timed // out before awakening. if (mWasFrozen) { + // Set startTime to the current time in addition to setting waitedFor to zero. + startTime = SystemClock.uptimeMillis(); waitedFor = 0; mWasFrozen = false; } else { |