summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorSusmitha Gummalla <vgummall@codeaurora.org>2015-10-08 16:00:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-30 15:02:45 -0700
commitf72f7d57142cd3415bc189a8a9dee39674117167 (patch)
tree481add83b199875cce742633375181a69bfe522b /services/camera
parent9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7 (diff)
downloadframeworks_av-f72f7d57142cd3415bc189a8a9dee39674117167.zip
frameworks_av-f72f7d57142cd3415bc189a8a9dee39674117167.tar.gz
frameworks_av-f72f7d57142cd3415bc189a8a9dee39674117167.tar.bz2
Camera: frameworks: Add NULL check for callback
--Added NULL check for mRemoteCallback Change-Id: Ib88a128a52e81b8ec1052e3222b6d8b9e494afcc
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 9a1101a..26c8007 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2024,7 +2024,11 @@ sp<CameraService::Client> CameraService::Client::getClientFromCookie(void* user)
void CameraService::Client::notifyError(ICameraDeviceCallbacks::CameraErrorCode errorCode,
const CaptureResultExtras& resultExtras) {
- mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0);
+ if (mRemoteCallback != NULL) {
+ mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0);
+ } else {
+ ALOGE("mRemoteCallback is NULL!!");
+ }
}
// NOTE: function is idempotent