Merged google#129

zoltanf · Apr 19, 2017 · 92f5fe4 · 92f5fe4
1 parent 8639186
commit 92f5fe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/library/src/main/api14/com/google/android/cameraview/Camera1.java b/library/src/main/api14/com/google/android/cameraview/Camera1.java
@@ -243,6 +243,7 @@ void takePictureInternal() {
                 public void onPictureTaken(byte[] data, Camera camera) {
                     isPictureCaptureInProgress.set(false);
                     mCallback.onPictureTaken(data);
+                    if (!isCameraOpened()) return;
                     camera.cancelAutoFocus();
                     camera.startPreview();
                 }

diff --git a/library/src/main/api21/com/google/android/cameraview/Camera2.java b/library/src/main/api21/com/google/android/cameraview/Camera2.java
@@ -651,6 +651,7 @@ public void onCaptureCompleted(@NonNull CameraCaptureSession session,
      * capturing a still picture.
      */
     void unlockFocus() {
+        if (!isCameraOpened()) return;
         mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
                 CaptureRequest.CONTROL_AF_TRIGGER_CANCEL);
         try {