diff options
author | Alex Ray <aray@google.com> | 2012-09-26 15:52:50 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 23:32:26 -0700 |
commit | 77449ada4b5ca73a948aa4fef9aafe3079a66d61 (patch) | |
tree | cc839d982498f1700355a38878ce17aef6ce0628 /services | |
parent | 6d6a4d3f37b332284b8b976bd5bb21d29007a97e (diff) |
Camera2: Re-entering preview state on v2 Device
Bug: 7240891
Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae
Diffstat (limited to 'services')
-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 a83977f2..d315abbd 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)); |