commit 8e84c4bb5b4acbc809acd956d63c75d4afb6fa76
author Valerie Hau <vhau@google.com> Tue Apr 14 21:54:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 21:54:21 2020 +0000
tree 2a1baf853575439c048d3bf5de0bd97f3051142c
parent 8536a66efb9c95b84aee9d3f82a105292dc900bf
parent 4b67844abb507367b3c0cb5b06c39993d29372b9

Merge "Send transaction callbacks earlier" into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 06209e6..ddf0775 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2245,6 +2245,9 @@
         }
     });
 
+    mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);
+    mTransactionCompletedThread.sendCallbacks();
+
     if (displayDevice && displayDevice->isPrimary() &&
         displayDevice->getPowerMode() == HWC_POWER_MODE_NORMAL && presentFenceTime->isValid()) {
         mScheduler->addPresentFence(presentFenceTime);
@@ -2325,9 +2328,6 @@
         }
     }
 
-    mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);
-    mTransactionCompletedThread.sendCallbacks();
-
     if (mLumaSampling && mRegionSamplingThread) {
         mRegionSamplingThread->notifyNewContent();
     }