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

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

1 files changed, 2 insertions, 2 deletions

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 @@ public:
                 }
 
                 nextEventTime = computeNextEventTimeLocked(now);
-                targetTime = nextEventTime - mWakeupLatency;
+                targetTime = nextEventTime;
 
                 bool isWakeup = false;
 
@@ -228,7 +228,7 @@ private:
             nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i],
                     ref);
 
-            if (t - mWakeupLatency < now) {
+            if (t < now) {
                 CallbackInvocation ci;
                 ci.mCallback = mEventListeners[i].mCallback;
                 ci.mEventTime = t;