commit 395379b4f74bcddd8cb1dfbcb8c789fdc28ca78c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 28 21:15:04 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 28 21:15:04 2020 +0000
tree ab25b664ca359c062e0c93a772379578ee86ac0c
parent c954b3eb27316c845c8d5f311d84855725b63fef
parent fdf1bffcb7f34f9e744a358724a0f5535dd0ee25

Merge "SurfaceFlinger: check for nullptr on setFrameTimelineVsync"

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;
 }