Fixes crash after accepting permission dialog (google#23)

* Fixes google#1 - Camera crashes after accepting permission dialog * Update try catch style
oyindonesia · Oct 4, 2016 · ebc1772 · ebc1772
1 parent c4af56f
commit ebc1772
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/library/src/main/api21/com/google/android/cameraview/Camera2.java b/library/src/main/api21/com/google/android/cameraview/Camera2.java
@@ -98,6 +98,8 @@ public void onConfigured(@NonNull CameraCaptureSession session) {
                 mCaptureSession.setRepeatingRequest(mPreviewRequestBuilder.build(),
                         mCaptureCallback, null);
             } catch (CameraAccessException e) {
+                Log.e(TAG, "Failed to start camera preview because it couldn't access camera", e);
+            } catch (IllegalStateException e) {
                 Log.e(TAG, "Failed to start camera preview.", e);
             }
         }
@@ -109,7 +111,9 @@ public void onConfigureFailed(@NonNull CameraCaptureSession session) {
 
         @Override
         public void onClosed(@NonNull CameraCaptureSession session) {
-            mCaptureSession = null;
+            if (mCaptureSession != null && mCaptureSession.equals(session)) {
+                mCaptureSession = null;
+            }
         }
 
     };