summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-11-21 18:23:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-21 18:23:29 +0000
commite1d38aa7bb9a8c6da4ceb479303599cd54b03235 (patch)
treee5c710c4adcc5097ba6b99680944956b0b7cdb0b /services
parent5692730ac35d45693e3aa76968a97809624f055b (diff)
parent6b6d8a79ef821541a7687ed924959369f73fc977 (diff)
downloadframeworks_av-e1d38aa7bb9a8c6da4ceb479303599cd54b03235.zip
frameworks_av-e1d38aa7bb9a8c6da4ceb479303599cd54b03235.tar.gz
frameworks_av-e1d38aa7bb9a8c6da4ceb479303599cd54b03235.tar.bz2
am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev
automerge: 6b6d8a7 * commit '6b6d8a79ef821541a7687ed924959369f73fc977': Camera2: Fix CameraParameters parse segfault.
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 4229538..1232c32 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) {