summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-build-prod@system.gserviceaccount.com>2021-11-29 08:44:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-11-29 08:44:49 +0000
commitb0b0c814096a03498207add99cd132b45a9f0b23 (patch)
treea2419d2fc143f3773a8a2670c4f378733aa56258
parenteb009cc2f3337df458237a923472f4463baf49bd (diff)
parentab575ea2e34872e460a49c56ff399b9b6b954655 (diff)
Merge "sf: addPresentFence based off of vsync source" into s-keystone-qcom-dev
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 23e33d197b..3a085eae2c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3113,7 +3113,8 @@ void SurfaceFlinger::postComposition() {
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);
}