commit 819f630cd12aaae16b10f0ba14d48c73d43a7a37
author Alec Mouri <alecmouri@google.com> Fri Feb 12 15:37:21 2021 -0800
committer Alec Mouri <alecmouri@google.com> Tue Feb 16 18:41:29 2021 +0000
tree 5f623b5e9e91a9b1bce541610b75f90e057d3e4c
parent e06403fa179494d6c5cafd0b4ffce767413eb14c

Set the render rate on the created surface frame instead of the old one.

Otherwise this crashes when overriding a framerate, since mSurfaceFrame
may not be initialized when a layer is first created.

Bug: 180141499
Test: builds, boots
Change-Id: I1f5cecae3fa44a00a61f125435245bcfb2b9ff90

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 6a28da3..237aaff 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1583,7 +1583,7 @@
     surfaceFrame->setAcquireFenceTime(postTime);
     const auto fps = mFlinger->mScheduler->getFrameRateOverride(getOwnerUid());
     if (fps) {
-        mSurfaceFrame->setRenderRate(*fps);
+        surfaceFrame->setRenderRate(*fps);
     }
     onSurfaceFrameCreated(surfaceFrame);
     return surfaceFrame;
@@ -1598,7 +1598,7 @@
     surfaceFrame->setActualQueueTime(queueTime);
     const auto fps = mFlinger->mScheduler->getFrameRateOverride(getOwnerUid());
     if (fps) {
-        mSurfaceFrame->setRenderRate(*fps);
+        surfaceFrame->setRenderRate(*fps);
     }
     // TODO(b/178542907): Implement onSurfaceFrameCreated for BQLayer as well.
     onSurfaceFrameCreated(surfaceFrame);