commit 09e600526f24c7f12aaf73e33e39ca0140d1f3e0
author Valerie Hau <vhau@google.com> Sun Dec 15 14:51:15 2019 -0800
committer Valerie Hau <vhau@google.com> Mon Dec 16 17:34:44 2019 +0000
tree 5360af5bcc010fd67883a9c53e84623ad926e43e
parent d0d28e3183d55c4a23d87b59681ceac3e3cf133d

Fix check for nullptr surface IBinder

Bug: 146345307
Test: build, boot, libsurfaceflinger_unittest, SurfaceFlinger_test
Change-Id: I79d5bb71beb573c3c8a150c938aa6d7fa301353f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 14a2ab1..1a0f56d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5482,7 +5482,10 @@
 }
 
 sp<Layer> SurfaceFlinger::fromHandle(const sp<IBinder>& handle) {
-    BBinder *b = handle->localBinder();
+    BBinder* b = nullptr;
+    if (handle) {
+        b = handle->localBinder();
+    }
     if (b == nullptr) {
         return nullptr;
     }