Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16387756 authored by Ady Abraham's avatar Ady Abraham Committed by android-build-merger
Browse files

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

am: 185bc771

Change-Id: If5066973227b84db873c63161528916bc23861f4
parents 3655f0b5 185bc771
Loading
Loading
Loading
Loading
+0 −11
Original line number Original line Diff line number Diff line
@@ -288,17 +288,6 @@ public:
                // new offset to allow for a seamless offset change without double-firing or
                // new offset to allow for a seamless offset change without double-firing or
                // skipping.
                // skipping.
                nsecs_t diff = oldPhase - phase;
                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.mLastEventTime -= diff;
                eventListener.mLastCallbackTime -= diff;
                eventListener.mLastCallbackTime -= diff;
                mCond.signal();
                mCond.signal();