Check focus area max number before applying (#167)

7 years ago · ef1a4ecc65
parent bcb2cfeb7f
commit ef1a4ecc65
1 changed files with 4 additions and 2 deletions
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
@ -38,8 +38,10 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
            if (!isCameraAvailable()) return;
            mCamera.cancelAutoFocus();
            Camera.Parameters params = mCamera.getParameters();
-            params.setFocusAreas(null);
-            params.setMeteringAreas(null);
+            int maxAF = params.getMaxNumFocusAreas();
+            int maxAE = params.getMaxNumMeteringAreas();
+            if (maxAF > 0) params.setFocusAreas(null);
+            if (maxAE > 0) params.setMeteringAreas(null);
            applyDefaultFocus(params); // Revert to internal focus.
            mCamera.setParameters(params);
        }