commit 185bc77105f6606737dcce792b93423649de6399
author Ady Abraham <adyabr@google.com> Mon Jun 17 15:22:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 17 15:22:24 2019 -0700
tree 77ad9daf738e73dc4ad2ac5ca71d9ac105869117
parent 84f80498180f50de94923f0e12cab92348860319
parent 2c97ca4f4ba634382fbffe990c126e6be6842982

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

Change-Id: Idf90e4ddc5cccb28c3d3433f6b4657b9273b2a9e

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();