commit 0dfc096b0816f584bc4aa7e81d658df3847a34be
author Nergi Rahardi <nergi@google.com> Thu May 23 06:57:36 2024 +0000
committer Nergi Rahardi <nergi@google.com> Thu Jun 13 05:39:00 2024 +0000
tree 360367e558986b408dcfb056199f106d5e4c711d
parent 27613c3cdced0d63e5981fbd55197f052a323b43

Revert^2 "SF: Update metadata of unvisible layers to backend"

This reverts commit ad34a68198c65bea568bac779fd8ad2937ba8087.

Reason for revert: Change::Metadata no longer sent on BLAST dequeueTime update ag/27478127

Change-Id: I912d50938089edfb56154561b53d365024ce15ed

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 694f147..53ed489 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -9315,7 +9315,9 @@
     std::vector<std::pair<Layer*, LayerFE*>> layers;
     if (mLayerLifecycleManagerEnabled) {
         nsecs_t currentTime = systemTime();
-        mLayerSnapshotBuilder.forEachVisibleSnapshot(
+        const bool needsMetadata = mCompositionEngine->getFeatureFlags().test(
+                compositionengine::Feature::kSnapshotLayerMetadata);
+        mLayerSnapshotBuilder.forEachSnapshot(
                 [&](std::unique_ptr<frontend::LayerSnapshot>& snapshot) FTL_FAKE_GUARD(
                         kMainThreadContext) {
                     if (cursorOnly &&
@@ -9338,6 +9340,12 @@
                     layerFE->mSnapshot = std::move(snapshot);
                     refreshArgs.layers.push_back(layerFE);
                     layers.emplace_back(legacyLayer.get(), layerFE.get());
+                },
+                [needsMetadata](const frontend::LayerSnapshot& snapshot) {
+                    return snapshot.isVisible ||
+                            (needsMetadata &&
+                             snapshot.changes.test(
+                                     frontend::RequestedLayerState::Changes::Metadata));
                 });
     }
     if (!mLayerLifecycleManagerEnabled) {