summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-11-21 17:49:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 17:49:37 +0000
commitffa3e71e47215b68fe4ae0b7a3f976db648d63d3 (patch)
treea061c36a4392000a1d7d5a9b4db5de0ec63e644f /services/camera
parente9e6a9306c42e0902d31f32dffc75135ff9dca49 (diff)
parentbc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf (diff)
downloadframeworks_av-ffa3e71e47215b68fe4ae0b7a3f976db648d63d3.zip
frameworks_av-ffa3e71e47215b68fe4ae0b7a3f976db648d63d3.tar.gz
frameworks_av-ffa3e71e47215b68fe4ae0b7a3f976db648d63d3.tar.bz2
am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev
* commit 'bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf': Camera2: Fix CameraParameters parse segfault.
Diffstat (limited to 'services/camera')
-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) {