commit b796a031fdf2fbf1cb472c26de3766b2858c6c9b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 24 17:45:45 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 24 17:45:45 2019 +0000
tree 7877cb89af4ad53bd33c1bd9e8a3198cee57b746
parent 81ca00ff8cd05913fe0e97e0f97b3a9ae7ed3299
parent b656aed06739e5a5ec7563970452237dca431edd

Merge "[SurfaceFlinger] Store current offsets in VSyncModulator." into qt-r1-dev

services/surfaceflinger/Scheduler/DispSync.cpp

diff --git a/services/surfaceflinger/Scheduler/DispSync.cpp b/services/surfaceflinger/Scheduler/DispSync.cpp
index 81be372..83fd42b 100644
--- a/services/surfaceflinger/Scheduler/DispSync.cpp
+++ b/services/surfaceflinger/Scheduler/DispSync.cpp
@@ -92,8 +92,12 @@
         mPeriod = period;
         if (!mModelLocked && referenceTimeChanged) {
             for (auto& eventListener : mEventListeners) {
-                eventListener.mLastEventTime =
-                        mReferenceTime - mPeriod + mPhase + eventListener.mPhase;
+                eventListener.mLastEventTime = mReferenceTime + mPhase + eventListener.mPhase;
+                // If mLastEventTime is after mReferenceTime (can happen when positive phase offsets
+                // are used) we treat it as like it happened in previous period.
+                if (eventListener.mLastEventTime > mReferenceTime) {
+                    eventListener.mLastEventTime -= mPeriod;
+                }
             }
         }
         if (mTraceDetailedInfo) {