commit 9fa926bb1d981eb9d8bb5ce0a84928dfa7066726
author Ady Abraham <adyabr@google.com> Mon Oct 12 21:47:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 12 21:47:03 2020 +0000
tree 9666b7fb1a9c5e826d0af076d70b00d40bc5d418
parent 7221a5fc1176f04037218087b3a7f140cd9d0c42
parent 18644d378b29808c166f1802f862ffae4f92f961

SurfaceFlinger: check for nullptr on setFrameRate am: 162f643dde am: 18644d378b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12794339

Change-Id: I6b486184997e0dfbf3ecc2a9c09ec8b0147fbd79

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 575da26..2ff26a9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6111,6 +6111,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)))) {