summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-08-21 09:43:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-21 09:43:11 -0700
commit302b93a47bb66f4dc7cb3a1dacf9f469075c8926 (patch)
tree9d21e6e3ec1d25d21ad3622653bebba332777c8d
parent58f853b1cfe6e5b9ea3985617bdadded1acc4ec8 (diff)
parentd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce (diff)
downloadframeworks_base-302b93a47bb66f4dc7cb3a1dacf9f469075c8926.zip
frameworks_base-302b93a47bb66f4dc7cb3a1dacf9f469075c8926.tar.gz
frameworks_base-302b93a47bb66f4dc7cb3a1dacf9f469075c8926.tar.bz2
am d7d58be0: am 00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Merge commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce' * commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce': Make the throttling more sensitive to end-to-end latency.
-rw-r--r--libs/ui/InputDispatcher.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index ce616a4..e35050c 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -201,7 +201,8 @@ void InputDispatcher::dispatchOnce() {
}
#endif
- mThrottleState.lastEventTime = currentTime;
+ mThrottleState.lastEventTime = entry->eventTime < currentTime
+ ? entry->eventTime : currentTime;
mThrottleState.lastDeviceId = deviceId;
mThrottleState.lastSource = source;
}