commit 235265613f85dd468a175d358f5f711449c603dd
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Dec 07 12:49:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 07 12:49:09 2020 +0000
tree 29ebf8bb5be88a29db42b7d586b277d66fb6c5de
parent 1b4a544500ef5cf16a6b91f52e7cb064c0bce8d3
parent 8aee36b0c2ffa546da56109defcf61bf63848f71

Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9e2ce22..39f923f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6228,6 +6228,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)))) {