diff options
| author | Natalie Silvanovich <natashenka@google.com> | 2014-05-01 14:44:52 -0700 |
|---|---|---|
| committer | Natalie Silvanovich <natashenka@google.com> | 2014-05-05 09:20:47 -0700 |
| commit | e1b55da41878255570f18809c5fee72544740344 (patch) | |
| tree | 8b7463ec103ad2fb15381d9e42429f0b7b3db019 /services/camera | |
| parent | c6b8225e759d1790d9a38082a18ce7e24a3dba27 (diff) | |
| download | frameworks_av-e1b55da41878255570f18809c5fee72544740344.zip frameworks_av-e1b55da41878255570f18809c5fee72544740344.tar.gz frameworks_av-e1b55da41878255570f18809c5fee72544740344.tar.bz2 | |
NULL check in ConnectPro
Prevents service crash
Bug: 13744720
Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
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(); |