commit 163877562cdeb033e0816da97b5b9c19903c3fed
author Ady Abraham <adyabr@google.com> Mon Jun 17 15:38:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 17 15:38:44 2019 -0700
tree b099f87c0c9146686ed7eb9b0be0f5c638680abd
parent 3655f0b53cc9031e5e0063c5d8940348b7a4b6c4
parent 185bc77105f6606737dcce792b93423649de6399

Merge "SurfaceFlinger: Dispsync changePhaseOffset" into qt-r1-dev am: 2c97ca4f4b
am: 185bc77105

Change-Id: If5066973227b84db873c63161528916bc23861f4

services/surfaceflinger/Scheduler/DispSync.cpp

diff --git a/services/surfaceflinger/Scheduler/DispSync.cpp b/services/surfaceflinger/Scheduler/DispSync.cpp
index e59d459..81be372 100644
--- a/services/surfaceflinger/Scheduler/DispSync.cpp
+++ b/services/surfaceflinger/Scheduler/DispSync.cpp
@@ -288,17 +288,6 @@
                 // new offset to allow for a seamless offset change without double-firing or
                 // skipping.
                 nsecs_t diff = oldPhase - phase;
-                if (diff > mPeriod / 2) {
-                    diff -= mPeriod;
-                } else if (diff < -mPeriod / 2) {
-                    diff += mPeriod;
-                }
-
-                if (phase < 0 && oldPhase > 0) {
-                    diff += mPeriod;
-                } else if (phase > 0 && oldPhase < 0) {
-                    diff -= mPeriod;
-                }
                 eventListener.mLastEventTime -= diff;
                 eventListener.mLastCallbackTime -= diff;
                 mCond.signal();