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 | 24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b (patch) | |
| tree | 0e9ebc618d720f5f327fe46c9680cda49d3c4cf4 /services/camera | |
| parent | d0cec0cb574a3d629afb7c32883bc986d7a65535 (diff) | |
| parent | 77449ada4b5ca73a948aa4fef9aafe3079a66d61 (diff) | |
| download | frameworks_av-24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b.zip frameworks_av-24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b.tar.gz frameworks_av-24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b.tar.bz2 | |
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
Diffstat (limited to 'services/camera')
| -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)); |