commit fdf1bffcb7f34f9e744a358724a0f5535dd0ee25
author Ady Abraham <adyabr@google.com> Mon Sep 28 11:27:30 2020 -0700
committer Ady Abraham <adyabr@google.com> Mon Sep 28 18:27:47 2020 +0000
tree 4f54f47e429dd06b757611dfb8e15927e8d07452
parent efcea5a87c6ed0738aecc4b3603f020cb8adb1ee

SurfaceFlinger: check for nullptr on setFrameTimelineVsync

Make sure that the layer still exists before trying to set
the vsync id for it.

Bug: 169577113
Test: manual
Change-Id: I4a0661adb7fc42476bfaf9d1c9f43999763d4c40

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6a0f24a..59a2ea4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6189,6 +6189,11 @@
     }
 
     sp<Layer> layer = (static_cast<MonitoredProducer*>(surface.get()))->getLayer();
+    if (layer == nullptr) {
+        ALOGE("Attempt to set frame timeline vsync on a layer that no longer exists");
+        return BAD_VALUE;
+    }
+
     layer->setFrameTimelineVsync(frameTimelineVsyncId);
     return NO_ERROR;
 }