summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-11-21 17:43:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-21 17:43:57 +0000
commitbc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf (patch)
treea061c36a4392000a1d7d5a9b4db5de0ec63e644f /services
parent3a8d7d1064a665a8a348710c7d27b31642f7f624 (diff)
parent5fc9d902510ccd04db80e0bc6aa679a4317a51b2 (diff)
downloadframeworks_av-bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf.zip
frameworks_av-bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf.tar.gz
frameworks_av-bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf.tar.bz2
Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index fd5a426..76428da 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -850,6 +850,7 @@ status_t CameraService::connectFinishUnsafe(const sp<BasicClient>& client,
const sp<IBinder>& remoteCallback) {
status_t status = client->initialize(mModule);
if (status != OK) {
+ ALOGE("%s: Could not initialize client from HAL module.", __FUNCTION__);
return status;
}
if (remoteCallback != NULL) {