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

Commit 7c0f1b36 authored by Alex Ray's avatar Alex Ray Committed by Android Git Automerger
Browse files

am 24dfc952: Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev 

* commit '24dfc952':
  Camera2: Re-entering preview state on v2 Device
parents 0c6bd60f 24dfc952

services/camera/libcameraservice/Camera2Client.cpp

+7 −1
Original line number Diff line number Diff line
@@ -624,7 +624,13 @@ status_t Camera2Client::startPreview() { 
status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {

    ATRACE_CALL();

    status_t res;

    if (params.state >= Parameters::PREVIEW && !restart) {

    if (params.state == Parameters::PREVIEW && !restart) {

        // Succeed attempt to re-enter preview state

        ALOGI("%s: Not starting preview; already in preview state.",

              __FUNCTION__);

        return OK;

    }

    if (params.state > Parameters::PREVIEW && !restart) {

        ALOGE("%s: Can't start preview in state %s",

                __FUNCTION__,

                Parameters::getStateName(params.state));