commit bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf
author Ruben Brunk <rubenbrunk@google.com> Fri Nov 21 17:43:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 21 17:43:57 2014 +0000
tree a061c36a4392000a1d7d5a9b4db5de0ec63e644f
parent 3a8d7d1064a665a8a348710c7d27b31642f7f624
parent 5fc9d902510ccd04db80e0bc6aa679a4317a51b2

Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev

camera/CameraParameters.cpp

diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 25d632d..e5e4e90 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -488,6 +488,11 @@
     const char* supportedPreviewFormats =
           get(CameraParameters::KEY_SUPPORTED_PREVIEW_FORMATS);
 
+    if (supportedPreviewFormats == NULL) {
+        ALOGW("%s: No supported preview formats.", __FUNCTION__);
+        return;
+    }
+
     String8 fmtStr(supportedPreviewFormats);
     char* prevFmts = fmtStr.lockBuffer(fmtStr.size());
 

services/camera/libcameraservice/CameraService.cpp

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 @@
                                             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) {