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

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -12,4 +12,7 @@
 * Adds implementation of availableCameras().
 * Implements camera preview, createCamera, initializeCamera, onCameraError, onDeviceOrientationChanged, and onCameraInitialized.
 * Adds integration test to plugin.
+* Bump CameraX version to 1.3.0-alpha04.
+* Fixes instance manager hot restart behavior and fixes Java casting issue.
 * Implements image capture.
+* Implements image streaming.

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

@@ -307,6 +307,43 @@ public interface Result<T> {
     void success(T result);
     void error(Throwable error);
   }
+  private static class InstanceManagerHostApiCodec extends StandardMessageCodec {
+    public static final InstanceManagerHostApiCodec INSTANCE = new InstanceManagerHostApiCodec();
+    private InstanceManagerHostApiCodec() {}
+  }
+
+  /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
+  public interface InstanceManagerHostApi {
+    void clear();
+
+    /** The codec used by InstanceManagerHostApi. */
+    static MessageCodec<Object> getCodec() {
+      return InstanceManagerHostApiCodec.INSTANCE;
+    }
+
+    /** Sets up an instance of `InstanceManagerHostApi` to handle messages through the `binaryMessenger`. */
+    static void setup(BinaryMessenger binaryMessenger, InstanceManagerHostApi api) {
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.InstanceManagerHostApi.clear", getCodec());
+        if (api != null) {
+          channel.setMessageHandler((message, reply) -> {
+            Map<String, Object> wrapped = new HashMap<>();
+            try {
+              api.clear();
+              wrapped.put("result", null);
+            }
+            catch (Error | RuntimeException exception) {
+              wrapped.put("error", wrapError(exception));
+            }
+            reply.reply(wrapped);
+          });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+    }
+  }
   private static class JavaObjectHostApiCodec extends StandardMessageCodec {
     public static final JavaObjectHostApiCodec INSTANCE = new JavaObjectHostApiCodec();
     private JavaObjectHostApiCodec() {}

packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/ImageCaptureTest.java

@@ -116,6 +116,7 @@ public void setFlashMode_setsFlashModeOfImageCaptureInstance() {
         mock(ImageCapture.OutputFileOptions.class);
     final ImageCapture.OnImageSavedCallback mockOnImageSavedCallback =
         mock(ImageCapture.OnImageSavedCallback.class);
+    @SuppressWarnings("unchecked")
     final GeneratedCameraXLibrary.Result<String> mockResult =
         mock(GeneratedCameraXLibrary.Result.class);
 
@@ -148,6 +149,7 @@ public void takePicture_sendsErrorWhenTemporaryFileCannotBeCreated() {
     final Long imageCaptureIdentifier = 6L;
     final File mockOutputDir = mock(File.class);
     final File mockTemporaryCaptureFile = mock(File.class);
+    @SuppressWarnings("unchecked")
     final GeneratedCameraXLibrary.Result<String> mockResult =
         mock(GeneratedCameraXLibrary.Result.class);
     final IOException fileCreationException = new IOException();
@@ -181,6 +183,7 @@ public void takePicture_usesExpectedOnImageSavedCallback() {
     final SystemServicesFlutterApiImpl mockSystemServicesFlutterApiImpl =
         mock(SystemServicesFlutterApiImpl.class);
     final File mockFile = mock(File.class);
+    @SuppressWarnings("unchecked")
     final GeneratedCameraXLibrary.Result<String> mockResult =
         mock(GeneratedCameraXLibrary.Result.class);
     final ImageCapture.OutputFileResults mockOutputFileResults =

packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart

@@ -46,7 +46,8 @@ class AndroidCameraCameraX extends CameraPlatform {
   @visibleForTesting
   ImageCapture? imageCapture;
 
-  /// 
+  /// The [ImageAnalysis] instance that can be configured to analyze individual
+  /// frames.
   ImageAnalysis? imageAnalysis;
 
   /// The [CameraSelector] used to configure the [processCameraProvider] to use
@@ -311,6 +312,7 @@ class AndroidCameraCameraX extends CameraPlatform {
   /// listen again later.
   ///
   /// [cameraId] and [options] are not used.
+  @override
   Stream<CameraImageData> onStreamedFrameAvailable(int cameraId,
       {CameraImageStreamOptions? options}) {
     assert(processCameraProvider != null);

packages/camera/camera_android_camerax/lib/src/camerax_library.g.dart

@@ -122,6 +122,43 @@ class ImageInformation {
   }
 }
 
+class _InstanceManagerHostApiCodec extends StandardMessageCodec {
+  const _InstanceManagerHostApiCodec();
+}
+
+class InstanceManagerHostApi {
+  /// Constructor for [InstanceManagerHostApi].  The [binaryMessenger] named argument is
+  /// available for dependency injection.  If it is left null, the default
+  /// BinaryMessenger will be used which routes to the host platform.
+  InstanceManagerHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
+
+  final BinaryMessenger? _binaryMessenger;
+
+  static const MessageCodec<Object?> codec = _InstanceManagerHostApiCodec();
+
+  Future<void> clear() async {
+    final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
+        'dev.flutter.pigeon.InstanceManagerHostApi.clear', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(null) as Map<Object?, Object?>?;
+    if (replyMap == null) {
+      throw PlatformException(
+        code: 'channel-error',
+        message: 'Unable to establish connection on channel.',
+      );
+    } else if (replyMap['error'] != null) {
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      throw PlatformException(
+        code: (error['code'] as String?)!,
+        message: error['message'] as String?,
+        details: error['details'],
+      );
+    } else {
+      return;
+    }
+  }
+}
+
 class _JavaObjectHostApiCodec extends StandardMessageCodec {
   const _JavaObjectHostApiCodec();
 }

packages/camera/camera_android_camerax/lib/src/image_capture.dart

@@ -126,7 +126,8 @@ class ImageCaptureHostApiImpl extends ImageCaptureHostApi {
 
   /// Sets the flash mode for the specified [ImageCapture] instance to take
   /// a picture with.
-  void setFlashModeFromInstance(ImageCapture instance, int flashMode) {
+  Future<void> setFlashModeFromInstance(
+      ImageCapture instance, int flashMode) async {
     final int? identifier = instanceManager.getIdentifier(instance);
     assert(identifier != null,
         'No ImageCapture has the identifer of that requested to get the resolution information for.');

packages/camera/camera_android_camerax/pigeons/camerax_library.dart

@@ -72,6 +72,14 @@ class ImageInformation {
   List<ImagePlaneInformation?> imagePlanesInformation;
 }
 
+@HostApi(dartHostTestHandler: 'TestInstanceManagerHostApi')
+abstract class InstanceManagerHostApi {
+  /// Clear the native `InstanceManager`.
+  ///
+  /// This is typically only used after a hot restart.
+  void clear();
+}
+
 @HostApi(dartHostTestHandler: 'TestJavaObjectHostApi')
 abstract class JavaObjectHostApi {
   void dispose(int identifier);

packages/camera/camera_android_camerax/test/image_capture_test.dart

@@ -76,7 +76,7 @@ void main() {
       instanceManager.addHostCreatedInstance(
         imageCapture,
         0,
-        onCopy: (_) => ImageCapture.detached(),
+        onCopy: (_) => ImageCapture.detached(instanceManager: instanceManager),
       );
 
       imageCapture.setFlashMode(flashMode);

packages/camera/camera_android_camerax/test/test_camerax_library.g.dart

@@ -16,17 +16,14 @@ import 'package:camera_android_camerax/src/camerax_library.g.dart';
 class _TestInstanceManagerHostApiCodec extends StandardMessageCodec {
   const _TestInstanceManagerHostApiCodec();
 }
-
 abstract class TestInstanceManagerHostApi {
   static const MessageCodec<Object?> codec = _TestInstanceManagerHostApiCodec();
 
   void clear();
-  static void setup(TestInstanceManagerHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestInstanceManagerHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.InstanceManagerHostApi.clear', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.InstanceManagerHostApi.clear', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {