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

flutter · May 11, 2024 · 7c1d1f8 · 7c1d1f8
2 parents 6849640 + f1ca81a
commit 7c1d1f8
Show file tree

Hide file tree

Showing 108 changed files with 1,281 additions and 555 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -394,17 +394,13 @@ targets:
           "CHANNEL": "stable"
         }
 
-  # All of the Linux_android android_platform_tests shards have the same
-  # dependency list, despite some running on Android 33 AVDs versus 34.
-  # See https://github.com/flutter/flutter/issues/137082 for context.
   - name: Linux_android android_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
@@ -423,7 +419,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
@@ -442,7 +437,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
@@ -461,7 +455,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
@@ -480,7 +473,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
@@ -499,7 +491,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
@@ -511,44 +502,6 @@ targets:
           "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
         }
 
-  - name: Linux_android android_platform_tests_api_33_shard_1 master
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
-      version_file: flutter_master.version
-      # set up for 33
-      package_sharding: "--shardIndex 0 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "master",
-          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
-        }
-
-  - name: Linux_android android_platform_tests_api_33_shard_2 master
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
-      version_file: flutter_master.version
-      # set up for 33
-      package_sharding: "--shardIndex 1 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "master",
-          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
-        }
-
   - name: Linux_android android_platform_tests_shard_1 stable
     recipe: packages/packages
     presubmit: false
@@ -663,42 +616,6 @@ targets:
           "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
         }
 
-  - name: Linux_android android_platform_tests_api_33_shard_1 stable
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: stable
-      version_file: flutter_stable.version
-      package_sharding: "--shardIndex 0 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "stable",
-          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
-        }
-
-  - name: Linux_android android_platform_tests_api_33_shard_2 stable
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: stable
-      version_file: flutter_stable.version
-      package_sharding: "--shardIndex 1 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "stable",
-          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
-        }
-
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_1 master
     recipe: packages/packages
     timeout: 60

diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-7920a52dd5680651118312f9be0600797ff2257e
+2bfb1b0e2f611173b0712856a42308b4977dc516
diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml
@@ -5,23 +5,23 @@ tasks:
   - name: download Dart and Android deps
     script: .ci/scripts/tool_runner.sh
     infra_step: true
-    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
   - name: build examples
     script: .ci/scripts/tool_runner.sh
-    args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["build-examples", "--apk"]
   - name: lint
     script: .ci/scripts/tool_runner.sh
-    args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["lint-android"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
     script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
   - name: native integration tests
     script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-unit"]
   - name: drive examples
     script: .ci/scripts/tool_runner.sh
-    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
diff --git a/.ci/targets/android_platform_tests_api_33_avd.yaml b/.ci/targets/android_platform_tests_api_33_avd.yaml
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,11 @@
 
 pubspec.lock
 
+# iOS and macOS dependencies
+.build/
 Podfile.lock
 Pods/
+.swiftpm/
 .symlinks/
 
 *instrumentscli*.trace

diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/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.

diff --git a/packages/camera/camera_android_camerax/README.md b/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
 
@@ -34,6 +34,10 @@ use cases, the plugin behaves according to the following:
     video recording and image streaming is supported, but concurrent video recording, image
     streaming, and image capture is not supported.
 
+### `setDescriptionWhileRecording` is unimplemented [Issue #148013][148013]
+`setDescriptionWhileRecording`, used to switch cameras while recording video, is currently unimplemented
+due to this not currently being supported by CameraX.
+
 ### 240p resolution configuration for video recording
 
 240p resolution configuration for video recording is unsupported by CameraX, and thus,
@@ -58,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