Revert "SF: Update metadata of unvisible layers to backend"
This reverts commit 8eb8f35c8d45282e480426bc26543acf31230cb8.
Reason for revert: b/341389467#comment3
Change-Id: I318d6b3d324be0bfa400e2759b22f1bdbc91e9ed
diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
index f10bb33..caeb575 100644
--- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
@@ -313,21 +313,6 @@
}
}
-void updateMetadataAndGameMode(LayerSnapshot& snapshot, const RequestedLayerState& requested,
- const LayerSnapshotBuilder::Args& args,
- const LayerSnapshot& parentSnapshot) {
- if (snapshot.changes.test(RequestedLayerState::Changes::GameMode)) {
- snapshot.gameMode = requested.metadata.has(gui::METADATA_GAME_MODE)
- ? requested.gameMode
- : parentSnapshot.gameMode;
- }
- updateMetadata(snapshot, requested, args);
- if (args.includeMetadata) {
- snapshot.layerMetadata = parentSnapshot.layerMetadata;
- snapshot.layerMetadata.merge(requested.metadata);
- }
-}
-
void clearChanges(LayerSnapshot& snapshot) {
snapshot.changes.clear();
snapshot.clientChanges = 0;
@@ -761,11 +746,6 @@
RequestedLayerState::Changes::Input)) {
updateInput(snapshot, requested, parentSnapshot, path, args);
}
- if (forceUpdate ||
- (args.includeMetadata &&
- snapshot.changes.test(RequestedLayerState::Changes::Metadata))) {
- updateMetadataAndGameMode(snapshot, requested, args, parentSnapshot);
- }
return;
}
@@ -806,7 +786,16 @@
}
if (forceUpdate || snapshot.changes.test(RequestedLayerState::Changes::Metadata)) {
- updateMetadataAndGameMode(snapshot, requested, args, parentSnapshot);
+ if (snapshot.changes.test(RequestedLayerState::Changes::GameMode)) {
+ snapshot.gameMode = requested.metadata.has(gui::METADATA_GAME_MODE)
+ ? requested.gameMode
+ : parentSnapshot.gameMode;
+ }
+ updateMetadata(snapshot, requested, args);
+ if (args.includeMetadata) {
+ snapshot.layerMetadata = parentSnapshot.layerMetadata;
+ snapshot.layerMetadata.merge(requested.metadata);
+ }
}
if (forceUpdate || snapshot.clientChanges & layer_state_t::eFixedTransformHintChanged ||
@@ -1175,15 +1164,6 @@
}
}
-void LayerSnapshotBuilder::forEachSnapshot(const Visitor& visitor,
- const ConstPredicate& predicate) {
- for (int i = 0; i < mNumInterestingSnapshots; i++) {
- std::unique_ptr<LayerSnapshot>& snapshot = mSnapshots.at((size_t)i);
- if (!predicate(*snapshot)) continue;
- visitor(snapshot);
- }
-}
-
void LayerSnapshotBuilder::forEachInputSnapshot(const ConstVisitor& visitor) const {
for (int i = mNumInterestingSnapshots - 1; i >= 0; i--) {
LayerSnapshot& snapshot = *mSnapshots[(size_t)i];