commit 7c1d8b5b207169d36c4b26bcf70f4923569afe43
author Alec Mouri <alecmouri@google.com> Tue Aug 29 20:14:46 2023 +0000
committer Alec Mouri <alecmouri@google.com> Thu Aug 31 17:59:22 2023 +0000
tree 100be4498079ab6b9af89203e04587d25366399d
parent f29700fb05dd225dc5b80dac5e4d80e074622e09

Use the correct frame rate vote for metrics

Applications using preferredDisplayModeId to request a frame rate will
have their vote recorded on the task SurfaceControl, so the entire layer
tree vote needs to be used.

Bug: 284866750
Test: builds
Test: test app setting preferredDisplayModeId
Change-Id: I04c575e58b842bebf5f79d86ec7ab7e738079886

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index af4b65b..93ebc8c 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -4018,7 +4018,7 @@
         const std::optional<Fps> renderRate =
                 mFlinger->mScheduler->getFrameRateOverride(getOwnerUid());
 
-        const auto vote = frameRateToSetFrameRateVotePayload(mDrawingState.frameRate);
+        const auto vote = frameRateToSetFrameRateVotePayload(getFrameRateForLayerTree());
         const auto gameMode = getGameMode();
 
         if (presentFence->isValid()) {