diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-29 01:30:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-29 01:30:13 -0700 |
| commit | f7daaad710a103f2d607c9a8d01ba3c2ed9c81fe (patch) | |
| tree | 10c0c9f25c9e633622980318fba8cfa7761f7455 | |
| parent | 823677618c3553797a28f43d8f6173c442d1f331 (diff) | |
| parent | bb9c086e0774773d8470635621030e0e25ae6258 (diff) | |
| download | android_packages_apps_Snap-f7daaad710a103f2d607c9a8d01ba3c2ed9c81fe.tar.gz android_packages_apps_Snap-f7daaad710a103f2d607c9a8d01ba3c2ed9c81fe.tar.bz2 android_packages_apps_Snap-f7daaad710a103f2d607c9a8d01ba3c2ed9c81fe.zip | |
Merge "Don't close session after abortCaptures" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index e013124a1..02d01c222 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4670,7 +4670,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())) { @@ -5306,7 +5308,7 @@ public class CaptureModule implements CameraModule, PhotoController, e.printStackTrace(); } } - if (!mPaused) { + if (!mPaused && !isAbortCapturesEnable()) { closePreviewSession(); } mMediaRecorderStarted = false; |