[camera_android] Provides a default exposure point if null

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.6
+
+* Provides a default exposure point if null
+
 ## 0.10.5
 
 * Allows camera to be switched while video recording.

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeature.java

@@ -20,6 +20,7 @@ public class ExposurePointFeature extends CameraFeature<Point> {
 
   private Size cameraBoundaries;
   private Point exposurePoint;
+  private MeteringRectangle[] defaultExposureRectangle;
   private MeteringRectangle exposureRectangle;
   private final SensorOrientationFeature sensorOrientationFeature;
 
@@ -72,9 +73,15 @@ public void updateBuilder(CaptureRequest.Builder requestBuilder) {
     if (!checkIsSupported()) {
       return;
     }
-    requestBuilder.set(
-        CaptureRequest.CONTROL_AE_REGIONS,
-        exposureRectangle == null ? null : new MeteringRectangle[] {exposureRectangle});
+    if (defaultExposureRectangle == null) {
+      defaultExposureRectangle = requestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
+    }
+    if (exposureRectangle != null) {
+      requestBuilder.set(
+          CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[] {exposureRectangle});
+    } else if (shouldReset(requestBuilder)) {
+      requestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, defaultExposureRectangle);
+    }
   }
 
   private void buildExposureRectangle() {
@@ -96,4 +103,9 @@ private void buildExposureRectangle() {
               this.cameraBoundaries, this.exposurePoint.x, this.exposurePoint.y, orientation);
     }
   }
+
+  public boolean shouldReset(CaptureRequest.Builder requestBuilder) {
+    MeteringRectangle[] currentRectangles = requestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
+    return currentRectangles == null || currentRectangles.length == 0;
+  }
 }

packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeatureTest.java

@@ -35,6 +35,8 @@ public class ExposurePointFeatureTest {
   Size mockCameraBoundaries;
   SensorOrientationFeature mockSensorOrientationFeature;
   DeviceOrientationManager mockDeviceOrientationManager;
+  MeteringRectangle[] mockDefaultExposureRectangle;
+  MeteringRectangle mockExposureRectangle;
 
   @Before
   public void setUp() {
@@ -308,6 +310,24 @@ public void updateBuilder_shouldNotSetMeteringRectangleWhenNoValidCoordsAreSuppl
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
     exposurePointFeature.setValue(new Point(null, 0d));
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
+
     verify(mockCaptureRequestBuilder, times(3)).set(any(), isNull());
   }
+
+  @Test
+  public void testShouldResetReturnsFalse() {
+    CaptureRequest.Builder mockCaptureRequestBuilder = mock(CaptureRequest.Builder.class);
+    MeteringRectangle[] defaultRectangles = new MeteringRectangle[1];
+    defaultRectangles[0] = mock(MeteringRectangle.class);
+    when(mockCaptureRequestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS))
+        .thenReturn(defaultRectangles);
+    mockCaptureRequestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, defaultRectangles);
+
+    ExposurePointFeature exposurePointFeature = mock(ExposurePointFeature.class);
+    exposurePointFeature.setCameraBoundaries(this.mockCameraBoundaries);
+    exposurePointFeature.setValue(new Point(0.5, 0.5));
+    exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
+
+    assertFalse(exposurePointFeature.shouldReset(mockCaptureRequestBuilder));
+  }
 }

packages/camera/camera_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera_android
 description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.5
+version: 0.10.6
 
 environment:
   sdk: ">=2.17.0 <4.0.0"