commit 27613c3cdced0d63e5981fbd55197f052a323b43
author Nergi Rahardi <nergi@google.com> Thu May 23 06:57:02 2024 +0000
committer Nergi Rahardi <nergi@google.com> Thu Jun 13 05:38:48 2024 +0000
tree 7622f08777dbe0b05a47ae3ac8070ebd57930685
parent 5503436944be1aa22a8a9732558a4e47a0a4ca87

Revert^2 "Set Change::Metadata on LayerMetadata update"

This reverts commit 10fbacda6dc007baca753d19ccfd148cd8a8eab9.

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

Change-Id: I9889ac6cfcd03103fcc9ede13f4b05a3bf8fcdb3

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
index ca53a0d..2d42437 100644
--- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
@@ -801,10 +801,12 @@
         }
     }
 
-    if (forceUpdate || snapshot.changes.test(RequestedLayerState::Changes::GameMode)) {
-        snapshot.gameMode = requested.metadata.has(gui::METADATA_GAME_MODE)
-                ? requested.gameMode
-                : parentSnapshot.gameMode;
+    if (forceUpdate || snapshot.changes.test(RequestedLayerState::Changes::Metadata)) {
+        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;