commit 4df2dae1c9265460c50635d2d37a547171239473
author Jesse Hall <jessehall@google.com> Mon Oct 14 10:51:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 10:51:54 2013 -0700
tree 1edb7f7d239a8afdad951b46f3d562ba020c1b0d
parent 9c8b3097e6a6023af0432a369740a98510faf975
parent 44b09f8b55bef56e06ad584db231916c17e30f5b

am 44b09f8b: am 44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev

* commit '44b09f8b55bef56e06ad584db231916c17e30f5b':
  DispSync: don't compensate for wakeup latency

services/surfaceflinger/DispSync.cpp

diff --git a/services/surfaceflinger/DispSync.cpp b/services/surfaceflinger/DispSync.cpp
index b2a604c..167c6f0 100644
--- a/services/surfaceflinger/DispSync.cpp
+++ b/services/surfaceflinger/DispSync.cpp
@@ -110,7 +110,7 @@
                 }
 
                 nextEventTime = computeNextEventTimeLocked(now);
-                targetTime = nextEventTime - mWakeupLatency;
+                targetTime = nextEventTime;
 
                 bool isWakeup = false;
 
@@ -228,7 +228,7 @@
             nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i],
                     ref);
 
-            if (t - mWakeupLatency < now) {
+            if (t < now) {
                 CallbackInvocation ci;
                 ci.mCallback = mEventListeners[i].mCallback;
                 ci.mEventTime = t;