commit 534103d4004ffd102609a09e0b55d329adbc1a57
author Jeff Brown <jeffbrown@google.com> Tue Oct 22 01:03:54 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 22 01:03:55 2013 +0000
tree df58615a28e74c8876b4cf456ded84cab704fc61
parent 4d8a8392f7a452479f228fbe08e43fa4145dda56
parent 786dccf9f5ee9ae04f5431b7ddbad173a81da8c7

Merge "Fix issues catching up to touch events after a short pause." into klp-dev

services/input/InputDispatcher.cpp

diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index 274009f..10a639e 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -1699,7 +1699,7 @@
         // up with lots of events because the application is not responding.
         // This condition ensures that ANRs are detected reliably.
         if (!connection->waitQueue.isEmpty()
-                && currentTime >= connection->waitQueue.head->eventEntry->eventTime
+                && currentTime >= connection->waitQueue.head->deliveryTime
                         + STREAM_AHEAD_EVENT_TIMEOUT) {
             return false;
         }