diff options
| author | Sultanxda <sultanxda@gmail.com> | 2015-09-06 02:16:18 -0700 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:00:49 +0100 |
| commit | 3fb36c88ffd3167fb131b792e4c2d12667410956 (patch) | |
| tree | 0f44ff70b164c56de62014325230feb4693726bd /src | |
| parent | f6486e7de208f9a3a297b9955eca9f1c4f41b2f9 (diff) | |
| download | android_packages_apps_Snap-3fb36c88ffd3167fb131b792e4c2d12667410956.tar.gz android_packages_apps_Snap-3fb36c88ffd3167fb131b792e4c2d12667410956.tar.bz2 android_packages_apps_Snap-3fb36c88ffd3167fb131b792e4c2d12667410956.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')
| -rw-r--r-- | 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 eb2c18248..fead92a57 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3115,6 +3115,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(); |