commit 6431d4afddc338a3e8a997f341df5a23d54efbc7
author Nergi Rahardi <nergi@google.com> Wed May 15 18:42:48 2024 +0900
committer Nergi Rahardi <nergi@google.com> Fri May 17 11:33:04 2024 +0900
tree e1fc6f5ebb60726fb16b82fd3cbf6a8c817e7680
parent 28064959760869dd22f5087aead12ef473919edc

Set Change::Metadata on LayerMetadata update

Currently, on layer_state_t::eMetadataChanged, only
Change::GameMode is set. Hence, for other metadata changes
such as METADATA_OWNER_UID, METADATA_MOUSE_CURSOR,
etc. (used by ARC++), these doesn't get propagated until
`forceUpdate=true` or `gameMode` is updated.

This leaves ARC++ LayerFE receiving stale metadata, even
though "update" was received.

Bug: 339382668
Test: atest libsurfaceflinger_unittests
Change-Id: I8130c3505b9808a9aa04d1641dc1c22352d6bf87

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
index f2497d4..caeb575 100644
--- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
@@ -785,10 +785,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;