commit 2d7553da520298e4bcabebe2984987a7607493e1
author Garfield Tan <xutan@google.com> Mon Mar 19 20:09:31 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 19 20:09:31 2018 +0000
tree b0103af91eee847a88f51d913b4cfce1e80e08e2
parent 223831d267a1604fda42304bb8a4b839c1a5c237
parent 3c6f5390a20fa0f32f0d46cb027a1b2412df2c26

Merge "Add a null check in case device disappears." into pi-dev
am: 3c6f5390a2

Change-Id: Ia730890f89d07025340c03211e829996ab20c2e8

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 282957f..11658e8 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4420,6 +4420,8 @@
     if (CC_UNLIKELY(display == 0)) return BAD_VALUE;
 
     const sp<const DisplayDevice> device(getDisplayDeviceLocked(display));
+    if (CC_UNLIKELY(device == 0)) return BAD_VALUE;
+
     DisplayRenderArea renderArea(device, sourceCrop, reqHeight, reqWidth, rotation);
 
     auto traverseLayers = std::bind(std::mem_fn(&SurfaceFlinger::traverseLayersInDisplay), this,