diff options
| author | Sultanxda <sultanxda@gmail.com> | 2015-09-06 02:16:18 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:39 +0200 |
| commit | 165aec53883a535e0186c9ee5019f3b42bb7542b (patch) | |
| tree | 1a5fa455b640e508472ae5f08650a1ebf92e26a1 /src/com/android/camera/PhotoModule.java | |
| parent | 77ef60a8bd0ecf78e8ca690eb62890163e92adb2 (diff) | |
| download | android_packages_apps_Snap-165aec53883a535e0186c9ee5019f3b42bb7542b.tar.gz android_packages_apps_Snap-165aec53883a535e0186c9ee5019f3b42bb7542b.tar.bz2 android_packages_apps_Snap-165aec53883a535e0186c9ee5019f3b42bb7542b.zip | |
SnapdragonCamera: Reset camera state after taking picture
mCameraState gets stuck to SNAPSHOT_IN_PROGRESS after taking a picture using autofocus/not ZSL, thus breaking camera capture.
Properly reset the camera state after taking a picture to fix this.
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rwxr-xr-x | src/com/android/camera/PhotoModule.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index be3dc9a24..9ffb550b7 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2919,6 +2919,11 @@ public class PhotoModule mErrorCallback.setActivity(mActivity); mCameraDevice.setErrorCallback(mErrorCallback); + // Reset camera state after taking a picture + if (mCameraState != PREVIEW_STOPPED && mCameraState != INIT) { + setCameraState(IDLE); + } + // Preview needs to be stopped when changing resolution if (mRestartPreview && mCameraState != PREVIEW_STOPPED && mCameraState != INIT) { stopPreview(); |