commit 3d8565aa9db1c38172b0f0bbc579810881e28815
author Vishnu Nair <vishnun@google.com> Fri Jun 30 07:23:24 2023 +0000
committer Vishnu Nair <vishnun@google.com> Fri Jun 30 07:24:09 2023 +0000
tree bcd4d6c9515eef067fd84c43f7850a1a4c85eeb8
parent 3cc15a4f1d6cf72afbb4d883e038ebf9108c78a9

[sf] propagate FrameRateSelectionPriority to child layers

Fixes an issue found with new fe where we did not
pass the FrameRateSelectionPriority to child layers.
Also populate the metadata from the requested state
when creating the layer snapshots.

Test: window type populated correctly in sf dump
Test: presubmit
Bug: 238781169
Change-Id: I74d970bad8079b1465764ebba34a3154ecf7ff59

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
index 21f0a67..3a19d0b 100644
--- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp
@@ -29,6 +29,7 @@
 
 #include "DisplayHardware/HWC2.h"
 #include "DisplayHardware/Hal.h"
+#include "Layer.h" // eFrameRateSelectionPriority constants
 #include "LayerLog.h"
 #include "LayerSnapshotBuilder.h"
 #include "TimeStats/TimeStats.h"
@@ -819,6 +820,13 @@
                 : parentSnapshot.frameRate;
     }
 
+    if (forceUpdate || snapshot.clientChanges & layer_state_t::eFrameRateSelectionPriority) {
+        snapshot.frameRateSelectionPriority =
+                (requested.frameRateSelectionPriority == Layer::PRIORITY_UNSET)
+                ? parentSnapshot.frameRateSelectionPriority
+                : requested.frameRateSelectionPriority;
+    }
+
     if (forceUpdate ||
         snapshot.clientChanges &
                 (layer_state_t::eBackgroundBlurRadiusChanged | layer_state_t::eBlurRegionsChanged |