[camera_android_camerax] Re-land "Force new Surface for each SurfaceRequest"

.ci/flutter_master.version

@@ -1 +1 @@
-46b097a3070d9941a729a201b972c65414c40b37
+c3279caa127d44914069326cd287c012bb3f2783

CODEOWNERS

@@ -22,7 +22,7 @@ packages/image_picker/**                                 @tarrinneal
 packages/interactive_media_ads/**                        @bparrishMines
 packages/in_app_purchase/**                              @bparrishMines
 packages/local_auth/**                                   @stuartmorgan-g
-packages/metrics_center/**                               @christopherfujino
+packages/metrics_center/**                               @bkonyi
 packages/multicast_dns/**                                @vashworth
 packages/path_provider/**                                @stuartmorgan-g
 packages/pigeon/**                                       @tarrinneal
@@ -32,12 +32,12 @@ packages/pointer_interceptor/**                          @ditman
 packages/quick_actions/**                                @bparrishMines
 packages/rfw/**                                          @Hixie
 packages/shared_preferences/**                           @tarrinneal
-packages/standard_message_codec/**                       @jonahwilliams
+packages/standard_message_codec/**                       @stuartmorgan-g
 packages/two_dimensional_scrollables/**                  @Piinks
 packages/url_launcher/**                                 @stuartmorgan-g
-packages/vector_graphics/**                              @jonahwilliams
-packages/vector_graphics_codec/**                        @jonahwilliams
-packages/vector_graphics_compiler/**                     @jonahwilliams
+packages/vector_graphics/**                              @jtmcdole
+packages/vector_graphics_codec/**                        @jtmcdole
+packages/vector_graphics_compiler/**                     @jtmcdole
 packages/video_player/**                                 @tarrinneal
 packages/web_benchmarks/**                               @yjbanov
 packages/webview_flutter/**                              @bparrishMines
@@ -52,71 +52,71 @@ third_party/packages/path_parsing/**                     @domesticmouse
 # matching entry takes precedence.
 
 # - Web
-packages/camera/camera_web/**                            @ditman
-packages/file_selector/file_selector_web/**              @ditman
-packages/google_maps_flutter/google_maps_flutter_web/**  @ditman
-packages/google_sign_in/google_sign_in_web/**            @ditman
-packages/image_picker/image_picker_for_web/**            @ditman
-packages/pointer_interceptor/pointer_interceptor_web/**  @ditman
-packages/shared_preferences/shared_preferences_web/**    @ditman
-packages/url_launcher/url_launcher_web/**                @ditman
-packages/video_player/video_player_web/**                @ditman
-packages/webview_flutter/webview_flutter_web/**          @ditman
+packages/camera/camera_web/**                                 @ditman
+packages/file_selector/file_selector_web/**                   @ditman
+packages/google_maps_flutter/google_maps_flutter_web/**       @ditman
+packages/google_sign_in/google_sign_in_web/**                 @ditman
+packages/image_picker/image_picker_for_web/**                 @ditman
+packages/pointer_interceptor/pointer_interceptor_web/**       @ditman
+packages/shared_preferences/shared_preferences_web/**         @ditman
+packages/url_launcher/url_launcher_web/**                     @ditman
+packages/video_player/video_player_web/**                     @ditman
+packages/webview_flutter/webview_flutter_web/**               @ditman
 
 # - Android
-packages/camera/camera_android/**                        @camsim99
-packages/camera/camera_android_camerax/**                @camsim99
-packages/espresso/**                                     @jesswrd
-packages/file_selector/file_selector_android/**          @mboetger
-packages/flutter_plugin_android_lifecycle/**             @reidbaker
-packages/google_maps_flutter/google_maps_flutter_android/**  @reidbaker
-packages/google_sign_in/google_sign_in_android/**        @ash2moon
-packages/image_picker/image_picker_android/**            @gmackall
-packages/in_app_purchase/in_app_purchase_android/**      @gmackall
-packages/local_auth/local_auth_android/**                @mboetger
-packages/path_provider/path_provider_android/**          @camsim99
-packages/quick_actions/quick_actions_android/**          @ash2moon
-packages/shared_preferences/shared_preferences_android/**  @jesswrd
-packages/url_launcher/url_launcher_android/**            @gmackall
-packages/video_player/video_player_android/**            @ash2moon
+packages/camera/camera_android/**                             @camsim99
+packages/camera/camera_android_camerax/**                     @camsim99
+packages/espresso/**                                          @jesswrd
+packages/file_selector/file_selector_android/**               @mboetger
+packages/flutter_plugin_android_lifecycle/**                  @reidbaker
+packages/google_maps_flutter/google_maps_flutter_android/**   @reidbaker
+packages/google_sign_in/google_sign_in_android/**             @ash2moon
+packages/image_picker/image_picker_android/**                 @gmackall
+packages/in_app_purchase/in_app_purchase_android/**           @gmackall
+packages/local_auth/local_auth_android/**                     @mboetger
+packages/path_provider/path_provider_android/**               @camsim99
+packages/quick_actions/quick_actions_android/**               @ash2moon
+packages/shared_preferences/shared_preferences_android/**     @jesswrd
+packages/url_launcher/url_launcher_android/**                 @gmackall
+packages/video_player/video_player_android/**                 @ash2moon
 # Owned by ecosystem team for now during the wrapper evaluation.
-packages/webview_flutter/webview_flutter_android/**      @bparrishMines
+packages/webview_flutter/webview_flutter_android/**           @bparrishMines
 
 # - Darwin
-packages/camera/camera_avfoundation/**                   @hellohuanlin @vashworth
-packages/file_selector/file_selector_ios/**              @vashworth @cbracken
-packages/file_selector/file_selector_macos/**            @vashworth @cbracken
-packages/google_maps_flutter/google_maps_flutter_ios/**  @vashworth @cbracken
-packages/google_sign_in/google_sign_in_ios/**            @LongCatIsLooong @cbracken
-packages/image_picker/image_picker_ios/**                @vashworth @louisehsu
-packages/image_picker/image_picker_macos/**              @vashworth @louisehsu
-packages/in_app_purchase/in_app_purchase_storekit/**     @louisehsu @LongCatIsLooong
-packages/local_auth/local_auth_darwin/**                 @cbracken @vashworth
-packages/path_provider/path_provider_foundation/**       @cbracken @vashworth
-packages/pointer_interceptor/pointer_interceptor_ios/**  @louisehsu @hellohuanlin
-packages/quick_actions/quick_actions_ios/**              @LongCatIsLooong @hellohuanlin
+packages/camera/camera_avfoundation/**                        @hellohuanlin @vashworth
+packages/file_selector/file_selector_ios/**                   @vashworth @cbracken
+packages/file_selector/file_selector_macos/**                 @vashworth @cbracken
+packages/google_maps_flutter/google_maps_flutter_ios/**       @vashworth @cbracken
+packages/google_sign_in/google_sign_in_ios/**                 @LongCatIsLooong @cbracken
+packages/image_picker/image_picker_ios/**                     @vashworth @louisehsu
+packages/image_picker/image_picker_macos/**                   @vashworth @louisehsu
+packages/in_app_purchase/in_app_purchase_storekit/**          @louisehsu @LongCatIsLooong
+packages/local_auth/local_auth_darwin/**                      @cbracken @vashworth
+packages/path_provider/path_provider_foundation/**            @cbracken @vashworth
+packages/pointer_interceptor/pointer_interceptor_ios/**       @louisehsu @hellohuanlin
+packages/quick_actions/quick_actions_ios/**                   @LongCatIsLooong @hellohuanlin
 packages/shared_preferences/shared_preferences_foundation/**  @tarrinneal
-packages/url_launcher/url_launcher_ios/**                @hellohuanlin @LongCatIsLooong
-packages/url_launcher/url_launcher_macos/**              @hellohuanlin @LongCatIsLooong
-packages/video_player/video_player_avfoundation/**       @LongCatIsLooong @hellohuanlin
-packages/webview_flutter/webview_flutter_wkwebview/**    @cbracken @louisehsu
+packages/url_launcher/url_launcher_ios/**                     @hellohuanlin @LongCatIsLooong
+packages/url_launcher/url_launcher_macos/**                   @hellohuanlin @LongCatIsLooong
+packages/video_player/video_player_avfoundation/**            @LongCatIsLooong @hellohuanlin
+packages/webview_flutter/webview_flutter_wkwebview/**         @cbracken @louisehsu
 
 # - Linux
-packages/file_selector/file_selector_linux/**            @cbracken
-packages/image_picker/image_picker_linux/**              @cbracken
-packages/path_provider/path_provider_linux/**            @cbracken
-packages/shared_preferences/shared_preferences_linux/**  @cbracken
-packages/url_launcher/url_launcher_linux/**              @cbracken
+packages/file_selector/file_selector_linux/**                 @stuartmorgan-g
+packages/image_picker/image_picker_linux/**                   @stuartmorgan-g
+packages/path_provider/path_provider_linux/**                 @stuartmorgan-g
+packages/shared_preferences/shared_preferences_linux/**       @stuartmorgan-g
+packages/url_launcher/url_launcher_linux/**                   @stuartmorgan-g
 
 # - Windows
-packages/camera/camera_windows/**                        @cbracken
-packages/file_selector/file_selector_windows/**          @cbracken
-packages/image_picker/image_picker_windows/**            @cbracken
-packages/local_auth/local_auth_windows/**                @cbracken
-packages/path_provider/path_provider_windows/**          @cbracken
-packages/shared_preferences/shared_preferences_windows/** @cbracken
-packages/url_launcher/url_launcher_windows/**            @cbracken
+packages/camera/camera_windows/**                             @stuartmorgan-g
+packages/file_selector/file_selector_windows/**               @stuartmorgan-g
+packages/image_picker/image_picker_windows/**                 @stuartmorgan-g
+packages/local_auth/local_auth_windows/**                     @stuartmorgan-g
+packages/path_provider/path_provider_windows/**               @stuartmorgan-g
+packages/shared_preferences/shared_preferences_windows/**     @stuartmorgan-g
+packages/url_launcher/url_launcher_windows/**                 @stuartmorgan-g
 
 # - DevTools extensions
 # @adsonpleal is the actual maintainer of shared_preferences_tool but is not yet a committer, so can't be listed as the owner.
-packages/shared_preferences/shared_preferences_tool/**  @tarrinneal
+packages/shared_preferences/shared_preferences_tool/**        @tarrinneal

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.6.20
+
+* Ensures that a new surface is provided every time that one is requested to render the camera preview
+  to fix pausing and resuming the preview.
+* Updates minimum supported SDK version to Flutter 3.32.8/Dart 3.8.1.
+
+## 0.6.19+1
+
+* Fixes incorrect camera switching by selecting a camera via its CameraInfo.
+
 ## 0.6.19
 
 * Changes target rotation of captured images to current default display rotation to fix captured

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

@@ -9,6 +9,7 @@
 import androidx.camera.core.CameraInfo;
 import androidx.camera.core.CameraSelector;
 import androidx.camera.core.ExperimentalLensFacing;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -24,7 +25,8 @@ class CameraSelectorProxyApi extends PigeonApiCameraSelector {
   @ExperimentalLensFacing
   @NonNull
   @Override
-  public CameraSelector pigeon_defaultConstructor(@Nullable LensFacing requireLensFacing) {
+  public CameraSelector pigeon_defaultConstructor(
+      @Nullable LensFacing requireLensFacing, @Nullable CameraInfo cameraInfoForFilter) {
     final CameraSelector.Builder builder = new CameraSelector.Builder();
     if (requireLensFacing != null) {
       switch (requireLensFacing) {
@@ -42,6 +44,9 @@ public CameraSelector pigeon_defaultConstructor(@Nullable LensFacing requireLens
           break;
       }
     }
+    if (cameraInfoForFilter != null) {
+      builder.addCameraFilter(cameraInfos -> Collections.singletonList(cameraInfoForFilter));
+    }
     return builder.build();
   }
 

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXLibrary.g.kt

@@ -2027,7 +2027,8 @@ abstract class PigeonApiCameraSelector(
     open val pigeonRegistrar: CameraXLibraryPigeonProxyApiRegistrar
 ) {
   abstract fun pigeon_defaultConstructor(
-      requireLensFacing: LensFacing?
+      requireLensFacing: LensFacing?,
+      cameraInfoForFilter: androidx.camera.core.CameraInfo?
   ): androidx.camera.core.CameraSelector
 
   /** A static `CameraSelector` that selects the default back facing camera. */
@@ -2057,10 +2058,12 @@ abstract class PigeonApiCameraSelector(
             val args = message as List<Any?>
             val pigeon_identifierArg = args[0] as Long
             val requireLensFacingArg = args[1] as LensFacing?
+            val cameraInfoForFilterArg = args[2] as androidx.camera.core.CameraInfo?
             val wrapped: List<Any?> =
                 try {
                   api.pigeonRegistrar.instanceManager.addDartCreatedInstance(
-                      api.pigeon_defaultConstructor(requireLensFacingArg), pigeon_identifierArg)
+                      api.pigeon_defaultConstructor(requireLensFacingArg, cameraInfoForFilterArg),
+                      pigeon_identifierArg)
                   listOf(null)
                 } catch (exception: Throwable) {
                   CameraXLibraryPigeonUtils.wrapError(exception)

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

@@ -121,7 +121,7 @@ public void onSurfaceCleanup() {
       // Provide surface.
       surfaceProducer.setSize(
           request.getResolution().getWidth(), request.getResolution().getHeight());
-      Surface flutterSurface = surfaceProducer.getSurface();
+      Surface flutterSurface = surfaceProducer.getForcedNewSurface();
       request.provideSurface(
           flutterSurface,
           Executors.newSingleThreadExecutor(),

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

@@ -10,6 +10,7 @@
 
 import androidx.camera.core.CameraInfo;
 import androidx.camera.core.CameraSelector;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
@@ -18,13 +19,30 @@ public class CameraSelectorTest {
   @Test
   public void pigeon_defaultConstructor_createsCameraSelectorInstanceWithLensFacing() {
     final PigeonApiCameraSelector api = new TestProxyApiRegistrar().getPigeonApiCameraSelector();
-
     final CameraSelector selector =
-        api.pigeon_defaultConstructor(io.flutter.plugins.camerax.LensFacing.FRONT);
+        api.pigeon_defaultConstructor(io.flutter.plugins.camerax.LensFacing.FRONT, null);
 
     assertEquals(selector.getLensFacing(), (Integer) CameraSelector.LENS_FACING_FRONT);
   }
 
+  @Test
+  public void pigeon_defaultConstructor_createsCameraSelectorInstanceWithCameraInfo() {
+    final PigeonApiCameraSelector api = new TestProxyApiRegistrar().getPigeonApiCameraSelector();
+    final androidx.camera.core.CameraInfo cameraInfo = mock(CameraInfo.class);
+    final androidx.camera.core.CameraInfo cameraInfoToSelect = mock(CameraInfo.class);
+
+    final CameraSelector selector = api.pigeon_defaultConstructor(null, cameraInfoToSelect);
+
+    final List<androidx.camera.core.CameraInfo> cameraInfosList = new ArrayList<>();
+    cameraInfosList.add(cameraInfo);
+    cameraInfosList.add(cameraInfoToSelect);
+
+    final List<androidx.camera.core.CameraInfo> filteredCameraInfosList =
+        selector.filter(new ArrayList<>(cameraInfosList));
+    assertEquals(1, filteredCameraInfosList.size());
+    assertEquals(cameraInfoToSelect, filteredCameraInfosList.get(0));
+  }
+
   @Test
   public void filter_callsFilterWithMethodParameters() {
     final PigeonApiCameraSelector api = new TestProxyApiRegistrar().getPigeonApiCameraSelector();

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

@@ -103,7 +103,7 @@ TextureRegistry getTextureRegistry() {
         ArgumentCaptor.forClass(TextureRegistry.SurfaceProducer.Callback.class);
 
     when(mockSurfaceRequest.getResolution()).thenReturn(new Size(5, 6));
-    when(mockSurfaceProducer.getSurface()).thenReturn(mock(Surface.class));
+    when(mockSurfaceProducer.getForcedNewSurface()).thenReturn(mock(Surface.class));
 
     final Preview.SurfaceProvider previewSurfaceProvider =
         api.createSurfaceProvider(mockSurfaceProducer, mockSystemServicesManager);
@@ -155,7 +155,7 @@ TextureRegistry getTextureRegistry() {
 
     when(mockSurfaceRequest.getResolution())
         .thenReturn(new Size(resolutionWidth, resolutionHeight));
-    when(mockSurfaceProducer.getSurface()).thenReturn(mockSurface);
+    when(mockSurfaceProducer.getForcedNewSurface()).thenReturn(mockSurface);
 
     final ArgumentCaptor<Surface> surfaceCaptor = ArgumentCaptor.forClass(Surface.class);
     final ArgumentCaptor<Consumer<SurfaceRequest.Result>> consumerCaptor =