Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6d8a79 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

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

* commit 'ffa3e71e':
  Camera2: Fix CameraParameters parse segfault.
parents 2fd47f8c ffa3e71e

camera/CameraParameters.cpp

+5 −0
Original line number Diff line number Diff line
@@ -488,6 +488,11 @@ void CameraParameters::getSupportedPreviewFormats(Vector<int>& formats) const { 
    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

+1 −0
Original line number Diff line number Diff line
@@ -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) {