commit 72ec8853452563e219f16aef6687a3e63ea7a331
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 14 04:01:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 04:01:57 2020 +0000
tree 84fce91a02864d333fa9be2fa448d4323e967645
parent 162f643dded48b230888139d1e4c8a5e2013a7cd
parent 181353f5c41609b3c969f10595a2379da427183f

Merge "Fix InputDevice listener notification for merged controller." into rvc-qpr-dev

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)))) {