summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-02-28 13:24:55 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-02-28 13:24:55 -0800
commit16988fb8cc67b0768e11313e48043575ac67e545 (patch)
tree232b6aadf0ba99f046d5556217f9d78fe2938143 /src/com/android/camera/CaptureModule.java
parent11e8b8771f6f5c638dbf9116178e111381a62609 (diff)
parent7b5e22799a57f23fde5615051a6409f9e89bc929 (diff)
Merge "SnapdragonCamera: Remove the stop preview when snapshot"
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 996b59a23..9e3bf53d7 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1761,14 +1761,12 @@ public class CaptureModule implements CameraModule, PhotoController,
if (mSaveRaw) {
captureBuilder.addTarget(mRawImageReader[id].getSurface());
}
+
if(mPaused || !mCamerasOpened) {
//for avoid occurring crash when click back before capture finished.
//CameraDevice was already closed
return;
}
- if (!mIsSupportedQcfa) {
- mCaptureSession[id].stopRepeating();
- }
if (mLongshotActive) {
captureStillPictureForLongshot(captureBuilder, id);
} else {
@@ -1790,7 +1788,6 @@ public class CaptureModule implements CameraModule, PhotoController,
}else{
captureBuilder.set(CaptureRequest.CONTROL_ENABLE_ZSL, false);
}
-
applySettingsForJpegInformation(captureBuilder, id);
addPreviewSurface(captureBuilder, null, id);
VendorTagUtil.setCdsMode(captureBuilder, 2); // CDS 0-OFF, 1-ON, 2-AUTO
@@ -5818,7 +5815,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
mUI.initializeProMode(!mPaused && promode);
}
-
+
boolean checkSessionAndBuilder(CameraCaptureSession session, CaptureRequest.Builder builder) {
return session != null && builder != null;
}