commit 4ac939239e9da3776a57d2f4cf23ad420e14cbb2
author Ady Abraham <adyabr@google.com> Thu Oct 08 18:40:47 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 30 01:45:47 2020 +0000
tree 0fabfae5646a515ec03e6d8d18cd658f25ed2890
parent 0d311974181d80b92678c9b2335c40ea5076e9ac

SurfaceFlinger: check for nullptr on setFrameRate

Make sure that the layer still exists before trying to set
the frame rate for it.

Bug: 170027345
Change-Id: Ice1edd7c5320f4d1d915643e30430919de258dbc
Test: manual
(cherry picked from commit 162f643dded48b230888139d1e4c8a5e2013a7cd)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 148749e..c9e595a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6227,6 +6227,11 @@
         Mutex::Autolock lock(mStateLock);
         if (authenticateSurfaceTextureLocked(surface)) {
             sp<Layer> layer = (static_cast<MonitoredProducer*>(surface.get()))->getLayer();
+            if (layer == nullptr) {
+                ALOGE("Attempt to set frame rate on a layer that no longer exists");
+                return BAD_VALUE;
+            }
+
             if (layer->setFrameRate(
                         Layer::FrameRate(frameRate,
                                          Layer::FrameRate::convertCompatibility(compatibility)))) {