commit b275b4dc3e5dcbae1e171bd51165a93f16332ef4
author Dan Stoza <stoza@google.com> Mon Mar 09 18:05:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 09 18:05:26 2015 +0000
tree 5e03f690d34884838095cc9b8b106e532d74bbb8
parent fcf1689c1a1654cb3b480356a1ba3ebf198f2943
parent 3949f664c71ad1269ee0c921d176e3b4484015cc

am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"

* commit '3949f664c71ad1269ee0c921d176e3b4484015cc':
  SurfaceFlinger: Fix null pointer exception

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3419295..7a1f243 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -620,7 +620,11 @@
 }
 
 int SurfaceFlinger::getActiveConfig(const sp<IBinder>& display) {
-    return getDisplayDevice(display)->getActiveConfig();
+    sp<DisplayDevice> device(getDisplayDevice(display));
+    if (device != NULL) {
+        return device->getActiveConfig();
+    }
+    return BAD_VALUE;
 }
 
 void SurfaceFlinger::setActiveConfigInternal(const sp<DisplayDevice>& hw, int mode) {