commit fbd1be3cf2729217e3c96e9793d2d91aa067801d
author Garfield Tan <xutan@google.com> Mon Mar 19 20:41:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 19 20:41:46 2018 +0000
tree a3557fd54d4c69cf1460ff19a451bfa5a800d665
parent 679424977592ec28c638d1c5c6d80a9228c95a91
parent 2d7553da520298e4bcabebe2984987a7607493e1

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

Change-Id: Ic84cc381543de9d450ca0c09e0eb024da8bd959f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 57c8ba9..ffa35e9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4487,6 +4487,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,