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

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,8 +1,16 @@
-## 0.6.4+2
+## 0.6.5+1
 
 * Updates `README.md` to reflect the fact that the `camera_android_camerax` camera plugin implementation
   is the endorsed Android implementation for `camera: ^0.11.0`.
 
+## 0.6.5
+
+* Modifies `stopVideoRecording` to ensure that the method only returns when CameraX reports that the
+  recorded video finishes saving to a file.
+* Modifies `startVideoCapturing` to ensure that the method only returns when CameraX reports that
+  video recording has started.
+* Adds empty implementation for `setDescriptionWhileRecording` and leaves a todo to add this feature.
+
 ## 0.6.4+1
 
 * Adds empty implementation for `prepareForVideoRecording` since this optimization is not used on Android.

packages/camera/camera_android_camerax/README.md

@@ -5,7 +5,7 @@ The Android implementation of [`camera`][1] built with the [CameraX library][2].
 *Note*: If any of [the limitations](#limitations) prevent you from using
 using `camera_android_camerax` or if you run into any problems, please report
 report these issues under [`flutter/flutter`][5] with `[camerax]` in the title.
-You may also opt back into the [`camera_android`][6] implementation if you need.
+You may also opt back into the [`camera_android`][9] implementation if you need.
 
 ## Usage
 
@@ -62,4 +62,8 @@ For more information on contributing to this plugin, see [`CONTRIBUTING.md`](CON
 [3]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin
 [4]: https://pub.dev/packages/camera_android
 [5]: https://github.com/flutter/flutter/issues/new/choose
-[6]: https://pub.dev/packages/camera_android#usage
+[6]: https://developer.android.com/media/camera/camerax/architecture#combine-use-cases
+[7]: https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3
+[8]: https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED
+[9]: https://pub.dev/packages/camera_android#usage
+[148013]: https://github.com/flutter/flutter/issues/148013