commit 1fe1117da5f793969752f44407e4618690b41d52
author Vishnu Nair <vishnun@google.com> Mon Apr 03 18:10:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 03 18:10:09 2023 +0000
tree 2228f59de7bc4b89d6f293143447911754ad9084
parent a7e4eaf3101db66f7c4792b63297ec5e47ef7b57

Revert "[sf] Trigger input updates in post composition"

This reverts commit a7e4eaf3101db66f7c4792b63297ec5e47ef7b57.

Reason for revert: b/275858990, b/276272159, b/275647448

Change-Id: I1578af4f6aaa9f208742ea5692636f43ca4fe28e

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3c5a3de..0bdede8 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2517,6 +2517,8 @@
     }
 
     updateCursorAsync();
+    updateInputFlinger();
+
     if (mLayerTracingEnabled && !mLayerTracing.flagIsSet(LayerTracing::TRACE_COMPOSITION)) {
         // This will block and tracing should only be enabled for debugging.
         mLayerTracing.notify(mVisibleRegionsDirty, frameTime.ns(), vsyncId.value);
@@ -2843,11 +2845,6 @@
         layer->releasePendingBuffer(presentTime.ns());
     }
 
-    mTransactionCallbackInvoker.addPresentFence(std::move(presentFence));
-    mTransactionCallbackInvoker.sendCallbacks(false /* onCommitOnly */);
-    mTransactionCallbackInvoker.clearCompletedTransactions();
-    updateInputFlinger();
-
     std::vector<std::pair<std::shared_ptr<compositionengine::Display>, sp<HdrLayerInfoReporter>>>
             hdrInfoListeners;
     bool haveNewListeners = false;
@@ -2904,6 +2901,10 @@
 
     mHdrLayerInfoChanged = false;
 
+    mTransactionCallbackInvoker.addPresentFence(std::move(presentFence));
+    mTransactionCallbackInvoker.sendCallbacks(false /* onCommitOnly */);
+    mTransactionCallbackInvoker.clearCompletedTransactions();
+
     mTimeStats->incrementTotalFrames();
     mTimeStats->setPresentFenceGlobal(presentFenceTime);