diff options
| author | Natalie Silvanovich <natashenka@google.com> | 2014-05-05 17:10:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 17:10:15 +0000 |
| commit | 6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9 (patch) | |
| tree | 798f8977a9b12767c61da988f474901eaf9cab2e /services/camera | |
| parent | fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 (diff) | |
| parent | e1b55da41878255570f18809c5fee72544740344 (diff) | |
| download | frameworks_av-6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9.zip frameworks_av-6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9.tar.gz frameworks_av-6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9.tar.bz2 | |
Merge "NULL check in ConnectPro"
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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(); |