diff options
| author | Alex Ray <aray@google.com> | 2012-09-28 10:30:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 10:30:39 -0700 |
| commit | d0dad6ece142f132f5d295330bfe386c2c28de46 (patch) | |
| tree | eac5c11c085ad1468e4337e49655e4375cf9f7d0 | |
| parent | 823b786e8558b7e73d9096cdd629e8896226e422 (diff) | |
| parent | 71d6454cc20b7a3bbe0cfd375c778c5fcc54795a (diff) | |
| download | frameworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.zip frameworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.tar.gz frameworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.tar.bz2 | |
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index a83977f..d315abb 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -624,7 +624,13 @@ status_t Camera2Client::startPreview() { status_t Camera2Client::startPreviewL(Parameters ¶ms, 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)); |