diff options
| author | weijiew <weijiew@codeaurora.org> | 2016-11-17 16:20:10 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-17 19:24:20 -0800 |
| commit | dcd024a7c4ff03dfcdf3401230f0716f0be9c28a (patch) | |
| tree | e1502685f140bb62732a52ba7ca5c37a78351538 /src | |
| parent | 27ebaef9c1210ee068c44585c4d6fb648d7e3d7d (diff) | |
| download | android_packages_apps_Snap-dcd024a7c4ff03dfcdf3401230f0716f0be9c28a.tar.gz android_packages_apps_Snap-dcd024a7c4ff03dfcdf3401230f0716f0be9c28a.tar.bz2 android_packages_apps_Snap-dcd024a7c4ff03dfcdf3401230f0716f0be9c28a.zip | |
SnapdragonCamera: Camera2 force close when zoom focus ring in video mode
When starting recording, a new captureSession will be created and the old
captureSession will be closed, but it still use old captureSession to apply
new zoom value.
Change-Id: I3c8b1f5346eddc2ffbb454a94cd401812276e4a5
CRs-Fixed: 1089903
Diffstat (limited to 'src')
| -rw-r--r-- | 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 05407d01a..423ed137a 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2540,7 +2540,7 @@ public class CaptureModule implements CameraModule, PhotoController, } } - private void startRecordingVideo(int cameraId) { + private void startRecordingVideo(final int cameraId) { if (null == mCameraDevice[cameraId]) { return; } @@ -2567,7 +2567,7 @@ public class CaptureModule implements CameraModule, PhotoController, createVideoSnapshotImageReader(); mVideoRequestBuilder = mCameraDevice[cameraId].createCaptureRequest(CameraDevice.TEMPLATE_RECORD); mVideoRequestBuilder.setTag(cameraId); - + mPreviewRequestBuilder[cameraId] = mVideoRequestBuilder; List<Surface> surfaces = new ArrayList<>(); Surface surface = getPreviewSurfaceForSession(cameraId); @@ -2593,6 +2593,7 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onConfigured(CameraCaptureSession cameraCaptureSession) { mCurrentSession = cameraCaptureSession; + mCaptureSession[cameraId] = cameraCaptureSession; CameraConstrainedHighSpeedCaptureSession session = (CameraConstrainedHighSpeedCaptureSession) mCurrentSession; try { @@ -2636,6 +2637,7 @@ public class CaptureModule implements CameraModule, PhotoController, public void onConfigured(CameraCaptureSession cameraCaptureSession) { Log.d(TAG, "StartRecordingVideo session onConfigured"); mCurrentSession = cameraCaptureSession; + mCaptureSession[cameraId] = cameraCaptureSession; try { setUpVideoCaptureRequestBuilder(mVideoRequestBuilder); mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), |