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

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

@@ -92,4 +92,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);
+  }
 }

packages/camera/camera_android_camerax/test/camera_info_test.mocks.dart

@@ -54,6 +54,14 @@ class MockTestCameraInfoHostApi extends _i1.Mock
       ) as int);
 
   @override
+  int getLiveCameraState(int? identifier) => (super.noSuchMethod(
+        Invocation.method(
+          #getLiveCameraState,
+          [identifier],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
   int getExposureState(int? identifier) => (super.noSuchMethod(
         Invocation.method(
           #getExposureState,