Merge branch 'main' into google-sign-in-android-disconnect

Author: stuartmorgan-g

.ci/flutter_master.version

@@ -1 +1 @@
-a0820964d59cd983341dffcc824676967178df70
+8f94cb0d8f013b28d2a3df5e477e43b923421dce

.ci/flutter_stable.version

@@ -1 +1 @@
-a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+d693b4b9dbac2acd4477aea4555ca6dcbea44ba2

.github/workflows/pull_request_label.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools

CODEOWNERS

@@ -6,15 +6,15 @@
 
 packages/animations/**                                   @hannah-hyj
 packages/camera/**                                       @bparrishMines
-packages/cross_file/**                                   @ditman
-packages/extension_google_sign_in_as_googleapis_auth/**  @ditman
+packages/cross_file/**                                   @stuartmorgan
+packages/extension_google_sign_in_as_googleapis_auth/**  @stuartmorgan
 packages/file_selector/**                                @stuartmorgan-g
 packages/flutter_lints/**                                @chunhtai
 packages/flutter_template_images/**                      @stuartmorgan-g
 packages/go_router/**                                    @chunhtai
 packages/go_router_builder/**                            @chunhtai
 packages/google_adsense/**                               @sokoloff06 @ditman
-packages/google_identity_services_web/**                 @ditman
+packages/google_identity_services_web/**                 @mdebbar
 packages/google_fonts/**                                 @Piinks
 packages/google_maps_flutter/**                          @stuartmorgan-g
 packages/google_sign_in/**                               @stuartmorgan-g
@@ -53,16 +53,16 @@ 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/**                                 @mdebbar
+packages/file_selector/file_selector_web/**                   @mdebbar
+packages/google_maps_flutter/google_maps_flutter_web/**       @mdebbar
+packages/google_sign_in/google_sign_in_web/**                 @mdebbar
+packages/image_picker/image_picker_for_web/**                 @mdebbar
+packages/pointer_interceptor/pointer_interceptor_web/**       @mdebbar
+packages/shared_preferences/shared_preferences_web/**         @mdebbar
+packages/url_launcher/url_launcher_web/**                     @mdebbar
+packages/video_player/video_player_web/**                     @mdebbar
+packages/webview_flutter/webview_flutter_web/**               @mdebbar
 
 # - Android
 packages/camera/camera_android/**                             @camsim99

packages/camera/camera_platform_interface/CHANGELOG.md

@@ -1,5 +1,7 @@
-## NEXT
+## 2.11.0
 
+* Adds a flag to configure a recording to be persistent across camera changes. See
+  `VideoCaptureOptions.enablePersistentRecording`.
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 
 ## 2.10.0

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

@@ -292,6 +292,10 @@ abstract class CameraPlatform extends PlatformInterface {
   }
 
   /// Sets the active camera while recording.
+  ///
+  /// On Android, you must start the recording with [startVideoCapturing]
+  /// with `enablePersistentRecording` set to `true`
+  /// to avoid cancelling any active recording.
   Future<void> setDescriptionWhileRecording(CameraDescription description) {
     throw UnimplementedError(
       'setDescriptionWhileRecording() is not implemented.',

packages/camera/camera_platform_interface/lib/src/types/video_capture_options.dart

@@ -18,6 +18,7 @@ class VideoCaptureOptions {
     this.maxDuration,
     this.streamCallback,
     this.streamOptions,
+    this.enablePersistentRecording = true,
   }) : assert(
          streamOptions == null || streamCallback != null,
          'Must specify streamCallback if providing streamOptions.',
@@ -43,6 +44,17 @@ class VideoCaptureOptions {
   /// Should only be set if a streamCallback is also present.
   final CameraImageStreamOptions? streamOptions;
 
+  /// Configures the recording to be a persistent recording.
+  ///
+  /// A persistent recording can only be stopped by explicitly calling [CameraPlatform.stopVideoRecording]
+  /// and will ignore events that would normally cause recording to stop, such as lifecycle events.
+  ///
+  /// On Android, you must set this parameter to `true`
+  /// to avoid cancelling any active recording when calling [CameraPlatform.setDescriptionWhileRecording].
+  ///
+  /// Defaults to `true`.
+  final bool enablePersistentRecording;
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -51,9 +63,15 @@ class VideoCaptureOptions {
           cameraId == other.cameraId &&
           maxDuration == other.maxDuration &&
           streamCallback == other.streamCallback &&
-          streamOptions == other.streamOptions;
+          streamOptions == other.streamOptions &&
+          enablePersistentRecording == other.enablePersistentRecording;
 
   @override
-  int get hashCode =>
-      Object.hash(cameraId, maxDuration, streamCallback, streamOptions);
+  int get hashCode => Object.hash(
+    cameraId,
+    maxDuration,
+    streamCallback,
+    streamOptions,
+    enablePersistentRecording,
+  );
 }

packages/camera/camera_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.10.0
+version: 2.11.0
 
 environment:
   sdk: ^3.7.0

packages/espresso/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.4.0+13
+
+* Bumps com.google.code.gson:gson from 2.11.0 to 2.13.2.
+
+## 0.4.0+12
+
+* Bumps androidx.test.espresso:espresso-* from 3.6.1 to 3.7.0.
+
 ## 0.4.0+11
 
 * Bumps androidx.test.ext:truth from 1.6.0 to 1.7.0.