From e1b55da41878255570f18809c5fee72544740344 Mon Sep 17 00:00:00 2001
From: Natalie Silvanovich <natashenka@google.com>
Date: Thu, 1 May 2014 14:44:52 -0700
Subject: NULL check in ConnectPro

Prevents service crash

Bug: 13744720
Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
---
 services/camera/libcameraservice/CameraService.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'services/camera')

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 @@ status_t CameraService::connectPro(
                                         /*out*/
                                         sp<IProCameraUser>& device)
 {
+    if (cameraCb == 0) {
+        ALOGE("%s: Callback must not be null", __FUNCTION__);
+        return BAD_VALUE;
+    }
+
     String8 clientName8(clientPackageName);
     int callingPid = getCallingPid();
 
-- 
cgit v1.1