Merge pull request #1 from carousell/fix/callback_null_pointer

check mCaptureSession for null in capture callback
carousell · Oct 16, 2017 · 23dbb88 · 23dbb88
2 parents 69908cb + aedd8e1
commit 23dbb88
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/src/main/api21/com/google/android/cameraview/Camera2.java b/library/src/main/api21/com/google/android/cameraview/Camera2.java
@@ -150,7 +150,9 @@ public void onPrecaptureRequired() {
 
         @Override
         public void onReady() {
-            captureStillPicture();
+            if (isCameraOpened()){
+                captureStillPicture();
+            }
         }
 
     };
@@ -762,7 +764,9 @@ void captureStillPicture() {
                         public void onCaptureCompleted(@NonNull CameraCaptureSession session,
                                 @NonNull CaptureRequest request,
                                 @NonNull TotalCaptureResult result) {
-                            unlockFocus();
+                            if (isCameraOpened()){
+                                unlockFocus();
+                            }
                         }
                     }, null);
             mCameraHandler.removeCallbacks(mReturnToContinuousAFRunnable);