Merge remote-tracking branch 'upstream/main' into camx_occ

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -21,3 +21,4 @@
 * Implements image streaming.
 * Provides LifecycleOwner implementation for Activities that use the plugin that do not implement it themselves.
 * Implements retrieval of camera information.
+* Implements onCameraClosing callback method for indicating the camera is closing and bumps CameraX version to 1.3.0-alpha05.

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraInfoHostApiImpl.java

@@ -6,8 +6,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.camera.core.CameraInfo;
+import androidx.camera.core.CameraState;
 import androidx.camera.core.ExposureState;
 import androidx.camera.core.ZoomState;
+import androidx.lifecycle.LiveData;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraInfoHostApi;
 import java.util.Objects;
@@ -66,4 +68,40 @@ public Long getZoomState(@NonNull Long identifier) {
 
     return instanceManager.getIdentifierForStrongReference(zoomState);
   }
+
+  /**
+   * Retrieves the {@link ExposureState} of the {@link CameraInfo} with the specified identifier.
+   */
+  @Override
+  @NonNull
+  public Long getExposureState(@NonNull Long identifier) {
+    CameraInfo cameraInfo =
+        (CameraInfo) Objects.requireNonNull(instanceManager.getInstance(identifier));
+    ExposureState exposureState = cameraInfo.getExposureState();
+
+    ExposureStateFlutterApiImpl exposureStateFlutterApiImpl =
+        new ExposureStateFlutterApiImpl(binaryMessenger, instanceManager);
+    exposureStateFlutterApiImpl.create(exposureState, result -> {});
+
+    return instanceManager.getIdentifierForStrongReference(exposureState);
+  }
+
+  /**
+   * Retrieves the current {@link ZoomState} value of the {@link CameraInfo} with the specified
+   * identifier.
+   */
+  @NonNull
+  @Override
+  public Long getZoomState(@NonNull Long identifier) {
+    CameraInfo cameraInfo =
+        (CameraInfo) Objects.requireNonNull(instanceManager.getInstance(identifier));
+    // TODO(camsim99): Create/return LiveData<ZoomState> once https://github.com/flutter/packages/pull/3419 lands.
+    ZoomState zoomState = cameraInfo.getZoomState().getValue();
+
+    ZoomStateFlutterApiImpl zoomStateFlutterApiImpl =
+        new ZoomStateFlutterApiImpl(binaryMessenger, instanceManager);
+    zoomStateFlutterApiImpl.create(zoomState, result -> {});
+
+    return instanceManager.getIdentifierForStrongReference(zoomState);
+  }
 }