summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2019-04-30 18:59:35 +0800
committerjinwu <jinwu@codeaurora.org>2019-04-30 18:59:35 +0800
commitbb9c086e0774773d8470635621030e0e25ae6258 (patch)
tree879531c5f77ab9f83282fa8fa60504ab82ba7077
parente7b55c8d6d823d58ea877b8819ed9669eb94034f (diff)
downloadandroid_packages_apps_Snap-bb9c086e0774773d8470635621030e0e25ae6258.tar.gz
android_packages_apps_Snap-bb9c086e0774773d8470635621030e0e25ae6258.tar.bz2
android_packages_apps_Snap-bb9c086e0774773d8470635621030e0e25ae6258.zip
Don't close session after abortCaptures
Change-Id: Iac4181dbda903bb4f0b15a30693ff9a672f75482
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index df0f43700..872c2841d 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4669,7 +4669,9 @@ public class CaptureModule implements CameraModule, PhotoController,
mState[cameraId] = STATE_PREVIEW;
mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
mIsAutoFocusStarted = false;
- closePreviewSession();
+ if (!isAbortCapturesEnable()) {
+ closePreviewSession();
+ }
mFrameProcessor.onClose();
if (mUI.setPreviewSize(mVideoPreviewSize.getWidth(), mVideoPreviewSize.getHeight())) {
@@ -5305,7 +5307,7 @@ public class CaptureModule implements CameraModule, PhotoController,
e.printStackTrace();
}
}
- if (!mPaused) {
+ if (!mPaused && !isAbortCapturesEnable()) {
closePreviewSession();
}
mMediaRecorderStarted = false;