diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-10 17:52:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 17:52:31 -0700 |
| commit | 60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1 (patch) | |
| tree | e5fadb2f26899bc340141accfe01cb9fff7cd21c /services/camera | |
| parent | b9c24111ecc135d47d563eaa3609730b6b4ee5e0 (diff) | |
| parent | 8d1ee30b8c867ac3a5f6daef0bdf97d4ea777cfe (diff) | |
| download | frameworks_av-60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1.zip frameworks_av-60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1.tar.gz frameworks_av-60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1.tar.bz2 | |
am cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit 'cb3911d30c515e06fbea0000af02fa3d09688943':
Camera2: Don't error out of startPreview when already recording.
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 0ab4e8c..7290663 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -611,10 +611,13 @@ status_t Camera2Client::startPreviewL(Parameters ¶ms, bool restart) { ALOGV("%s: state == %d, restart = %d", __FUNCTION__, params.state, restart); - if (params.state == Parameters::PREVIEW && !restart) { - // Succeed attempt to re-enter preview state - ALOGI("%s: Not starting preview; already in preview state.", - __FUNCTION__); + if ( (params.state == Parameters::PREVIEW || + params.state == Parameters::RECORD || + params.state == Parameters::VIDEO_SNAPSHOT) + && !restart) { + // Succeed attempt to re-enter a streaming state + ALOGI("%s: Camera %d: Preview already active, ignoring restart", + __FUNCTION__, mCameraId); return OK; } if (params.state > Parameters::PREVIEW && !restart) { |