Merge remote-tracking branch 'origin/master'

# Conflicts: # camera/src/main/java/com/senssun/camera/CameraBuilder.kt
liangzhengang · Nov 26, 2021 · d13d5a9 · d13d5a9
2 parents b02a819 + 8a733b5
commit d13d5a9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/camera/src/main/java/com/senssun/camera/CameraBuilder.kt b/camera/src/main/java/com/senssun/camera/CameraBuilder.kt
@@ -123,8 +123,7 @@ class CameraBuilder(val fragment: Fragment?, val activity: AppCompatActivity?) {
             if (preview == null) {
                 camera = cameraProvider.bindToLifecycle(
                     fragment ?: activity!!,
-                    cameraSelector ?: CameraSelector.DEFAULT_FRONT_CAMERA, imageCapture
-                )
+                    cameraSelector ?: CameraSelector.DEFAULT_FRONT_CAMERA,imageCapture)
             } else {
                 camera = cameraProvider.bindToLifecycle(
                     fragment ?: activity!!,