Merge branch 'main' into camera_exposure_fix

packages/camera/camera_android/CHANGELOG.md

@@ -1,7 +1,12 @@
-## 0.10.7
+## 0.10.8
 
 * Provides a default exposure point if null.
 
+## 0.10.7
+
+* Adds support for NV21 as a new streaming format in Android which includes correct handling of
+  image padding when present.
+
 ## 0.10.6+2
 
 * Fixes compatibility with AGP versions older than 4.2.

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -1199,12 +1199,10 @@ public void onCancel(Object o) {
         });
   }
 
-  private void setImageStreamImageAvailableListener(final EventChannel.EventSink imageStreamSink) {
-    imageStreamReader.setOnImageAvailableListener(
-        reader -> {
-          Image img = reader.acquireNextImage();
-          // Use acquireNextImage since image reader is only for one image.
-          if (img == null) return;
+  void setImageStreamImageAvailableListener(final EventChannel.EventSink imageStreamSink) {
+    if (imageStreamReader == null) {
+      return;
+    }
 
     imageStreamReader.subscribeListener(this.captureProps, imageStreamSink, backgroundHandler);
   }

packages/camera/camera_android/pubspec.yaml

@@ -3,7 +3,7 @@ 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.7
+version: 0.10.8
 
 environment:
   sdk: ">=2.17.0 <4.0.0"