commit e1b55da41878255570f18809c5fee72544740344
author Natalie Silvanovich <natashenka@google.com> Thu May 01 14:44:52 2014 -0700
committer Natalie Silvanovich <natashenka@google.com> Mon May 05 09:20:47 2014 -0700
tree 8b7463ec103ad2fb15381d9e42429f0b7b3db019
parent c6b8225e759d1790d9a38082a18ce7e24a3dba27

NULL check in ConnectPro

Prevents service crash

Bug: 13744720
Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 02bca1f..c6b4670 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -575,6 +575,11 @@
                                         /*out*/
                                         sp<IProCameraUser>& device)
 {
+    if (cameraCb == 0) {
+        ALOGE("%s: Callback must not be null", __FUNCTION__);
+        return BAD_VALUE;
+    }
+
     String8 clientName8(clientPackageName);
     int callingPid = getCallingPid();