summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/DispSync.cpp
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-10-13 20:13:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-13 20:13:59 +0000
commit44e45cfeb37a04c206730b12ff001525ebe42a7b (patch)
treefe22609190285707b831a885b939caf831094acc /services/surfaceflinger/DispSync.cpp
parent6410c8c4097f1a3246aa3d03b3291d47f982bc4b (diff)
parent0d5c60edf11fdded738acf3f78a0c667599cd60d (diff)
downloadframeworks_native-44e45cfeb37a04c206730b12ff001525ebe42a7b.zip
frameworks_native-44e45cfeb37a04c206730b12ff001525ebe42a7b.tar.gz
frameworks_native-44e45cfeb37a04c206730b12ff001525ebe42a7b.tar.bz2
Merge "DispSync: don't compensate for wakeup latency" into klp-dev
Diffstat (limited to 'services/surfaceflinger/DispSync.cpp')
-rw-r--r--services/surfaceflinger/DispSync.cpp4
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;