commit b0b0c814096a03498207add99cd132b45a9f0b23
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Mon Nov 29 08:44:49 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 29 08:44:49 2021 +0000
tree a2419d2fc143f3773a8a2670c4f378733aa56258
parent eb009cc2f3337df458237a923472f4463baf49bd
parent ab575ea2e34872e460a49c56ff399b9b6b954655

Merge "sf: addPresentFence based off of vsync source" into s-keystone-qcom-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 23e33d1..3a085ea 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3113,7 +3113,8 @@
     mTransactionCallbackInvoker.addPresentFence(mPreviousPresentFences[0].fence);
     mTransactionCallbackInvoker.sendCallbacks();
 
-    if (display && display->isPrimary() && display->getPowerMode() == hal::PowerMode::ON &&
+    if (vSyncSource && vSyncSource == getCurrentVsyncSource() &&
+        vSyncSource->getPowerMode() == hal::PowerMode::ON &&
         mPreviousPresentFences[0].fenceTime->isValid()) {
         mScheduler->addPresentFence(mPreviousPresentFences[0].fenceTime);
     }