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

Commit 2552036a authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev

parents 64d6c687 b0752523

services/camera/libcameraservice/Camera2Client.cpp

+0 −9
Original line number Diff line number Diff line
@@ -64,15 +64,6 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 


    SharedParameters::Lock l(mParameters);

    l.mParameters.state = Parameters::DISCONNECTED;



    char value[PROPERTY_VALUE_MAX];

    property_get("camera.zsl_mode", value, "0");

    if (!strcmp(value,"1")) {

        ALOGI("Camera %d: Enabling ZSL mode", cameraId);

        l.mParameters.zslMode = true;

    } else {

        l.mParameters.zslMode = false;

    }

}



status_t Camera2Client::checkPid(const char* checkLocation) const {

services/camera/libcameraservice/camera2/Parameters.cpp

+9 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <math.h>

#include <stdlib.h>

#include <cutils/properties.h>



#include "Parameters.h"

#include "system/camera.h"
@@ -748,7 +749,14 @@ status_t Parameters::initialize(const CameraMetadata *info) { 


    previewCallbackFlags = 0;



    char value[PROPERTY_VALUE_MAX];

    property_get("camera.zsl_mode", value, "0");

    if (!strcmp(value,"1")) {

        ALOGI("Camera %d: Enabling ZSL mode", cameraId);

        zslMode = true;

    } else {

        zslMode = false;

    }



    lightFx = LIGHTFX_NONE;