Merge tag 'LA.QSSI.12.0.r1-06100-qssi.0' into sugisawasugisawa

"LA.QSSI.12.0.r1-06100-qssi.0"

Change-Id: I8375c5be732ba39cd8b840a5003b82ab2e758503

1 files changed, 9 insertions, 2 deletions

diff --git a/services/surfaceflinger/Scheduler/MessageQueue.cpp b/services/surfaceflinger/Scheduler/MessageQueue.cpp
index 294783ab34..a339375db0 100644
--- a/services/surfaceflinger/Scheduler/MessageQueue.cpp
+++ b/services/surfaceflinger/Scheduler/MessageQueue.cpp
@@ -125,8 +125,15 @@ void MessageQueue::vsyncCallback(nsecs_t vsyncTime, nsecs_t targetWakeupTime, ns
         mFlinger->mDolphinWrapper.dolphinTrackVsyncSignal(vsyncTime, targetWakeupTime, readyTime);
     }
 
-    if (mFlinger->mSmoMo) {
-        mFlinger->mSmoMo->OnVsync(vsyncTime);
+    SmomoIntf *smoMo = nullptr;
+    for (auto &instance: mFlinger->mSmomoInstances) {
+        if (instance.displayId == 0) {
+            smoMo = instance.smoMo;
+            break;
+        }
+    }
+    if (smoMo) {
+        smoMo->OnVsync(vsyncTime);
     }
 
     mHandler->dispatchInvalidate(mVsync.tokenManager->generateTokenForPredictions(