Merge branch 'main' into dependabot/github_actions/github/codeql-action-2.21.1

Author: stuartmorgan-g

.ci.yaml

@@ -464,6 +464,65 @@ targets:
           {"dependency": "android_virtual_device", "version": "33"}
         ]
 
+  # Device versions of Android integration tests, run via FTL.
+  # TODO(stuartmorgan): Revisit whether physical device tests are redundant once
+  # we have more data about emulator tests; see
+  # https://github.com/flutter/flutter/issues/131429.
+
+  - name: Linux_android android_device_tests_shard_1 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 0 --shardCount 6"
+
+  - name: Linux_android android_device_tests_shard_2 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 1 --shardCount 6"
+
+  - name: Linux_android android_device_tests_shard_3 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 2 --shardCount 6"
+
+  - name: Linux_android android_device_tests_shard_4 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 3 --shardCount 6"
+
+  - name: Linux_android android_device_tests_shard_5 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 4 --shardCount 6"
+
+  - name: Linux_android android_device_tests_shard_6 master
+    recipe: packages/packages
+    timeout: 60
+    properties:
+      target_file: android_device_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 5 --shardCount 6"
+
   ### Web tasks ###
   - name: Linux_web web_build_all_packages master
     recipe: packages/packages

.ci/flutter_master.version

@@ -1 +1 @@
-61fd11db2b7aeb429995278803473ae0f7da061b
+e81907e07a385e79e67734162d435b11f5339000

.ci/targets/android_device_tests.yaml

@@ -0,0 +1,17 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: download Dart and Android deps
+    script: script/tool_runner.sh
+    infra_step: true
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
+  - name: Firebase Test Lab
+    script: script/tool_runner.sh
+    args:
+      - "firebase-test-lab"
+      - "--device"
+      - "model=redfin,version=30"
+      - "--exclude=script/configs/exclude_integration_android.yaml"
+      - "--project=flutter-infra-staging"
+      - "--results-bucket=flutter_firebase_testlab_staging"

.cirrus.yml

@@ -2,39 +2,21 @@ gcp_credentials: ENCRYPTED[!9c8e92e8da192ce2a51b7d4ed9948c4250d0bae3660193d9b901
 
 # Run on PRs and main branch post submit only. Don't run tests when tagging.
 only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
-env:
-  CHANNEL: "master" # Default to master when not explicitly set by a task.
-  PLUGIN_TOOL_COMMAND: "dart ./script/tool/bin/flutter_plugin_tools.dart"
 
 setup_template: &SETUP_TEMPLATE
   upgrade_flutter_script:
-    # Channels that are part of our normal test matrix use a pinned,
-    # auto-rolled version to prevent out-of-band CI failures due to changes in
-    # Flutter.
-    - TARGET_TREEISH=$CHANNEL
-    - if [[ "$CHANNEL" == "master" || "$CHANNEL" == "stable" ]]; then
-    -   TARGET_TREEISH=$(< .ci/flutter_$CHANNEL.version)
-    - fi
-    # Ensure that the repository has all the branches.
+    - PINNED_VERSION=$(< .ci/flutter_master.version)
+    # Ensure that the repository has everything.
     - cd $FLUTTER_HOME
     - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
     - git fetch origin
-    # Switch to the requested channel.
+    # Switch to the pinned master version.
     - git checkout $TARGET_TREEISH
-    # When using a branch rather than a hash or version tag, reset to the
-    # upstream branch rather than using pull, since the base image can sometimes
-    # be in a state where it has diverged from upstream (!).
-    - if [[ "$TARGET_TREEISH" == "$CHANNEL" ]] && [[ "$CHANNEL" != *"."* ]]; then
-    -   git reset --hard @{u}
-    - fi
     # Run doctor to allow auditing of what version of Flutter the run is using.
     - flutter doctor -v
   tool_setup_script:
     - .ci/scripts/prepare_tool.sh
 
-# Light-workload Linux tasks.
-# These use default machines, with fewer CPUs, to reduce pressure on the
-# concurrency limits.
 task:
   << : *SETUP_TEMPLATE
   gke_container:
@@ -50,43 +32,3 @@ task:
       only_if: $CIRRUS_PR != ''
       version_script:
         - ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS"
-
-# Heavy-workload Linux tasks.
-# These use machines with more CPUs and memory, so will reduce parallelization
-# for non-credit runs.
-task:
-  << : *SETUP_TEMPLATE
-  gke_container:
-    dockerfile: .ci/Dockerfile
-    builder_image_name: docker-builder-linux # gce vm image
-    builder_image_project: flutter-cirrus
-    cluster_name: test-cluster
-    zone: us-central1-a
-    namespace: default
-    cpu: 4
-    memory: 16G
-  matrix:
-    ### Android tasks ###
-    - name: android-platform_tests
-      # Don't run full platform tests on both channels in pre-submit.
-      skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
-      env:
-        matrix:
-          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 6"
-          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 6"
-          PACKAGE_SHARDING: "--shardIndex 2 --shardCount 6"
-          PACKAGE_SHARDING: "--shardIndex 3 --shardCount 6"
-          PACKAGE_SHARDING: "--shardIndex 4 --shardCount 6"
-          PACKAGE_SHARDING: "--shardIndex 5 --shardCount 6"
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-        MAPS_API_KEY: ENCRYPTED[d6583b08f79f91ea4844c77460f04539965e46ad2fd97fb7c062b4dfe88016228b86ebe8c220ab4187e0c4bd773dc1e7]
-        GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[1a2eebf9367197bbe812d9a0ea83a53a05aeba4bb5e4964fe6a69727883cd87e51238d39237b1f80b0894c48419ac268]
-      firebase_test_lab_script:
-        - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
-        -   echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
-        -   ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --exclude=script/configs/exclude_integration_android.yaml
-        - else
-        -   echo "This user does not have permission to run Firebase Test Lab tests."
-        - fi

packages/camera/camera/test/camera_value_test.dart

@@ -2,14 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(a14n): remove this import once Flutter 3.1 or later reaches stable (including flutter/flutter#106316)
-// ignore: unnecessary_import
-import 'dart:ui';
-
 import 'package:camera/camera.dart';
-// TODO(a14n): remove this import once Flutter 3.1 or later reaches stable (including flutter/flutter#106316)
-// ignore: unnecessary_import
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.8+5
+
+* Provides a default exposure point if null.
+
 ## 0.10.8+4
 
 * Adjusts SDK checks for better testability.

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeature.java

@@ -10,6 +10,7 @@
 import android.util.Size;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.plugins.camera.CameraProperties;
 import io.flutter.plugins.camera.CameraRegionUtils;
@@ -24,6 +25,8 @@ public class ExposurePointFeature extends CameraFeature<Point> {
   @Nullable private Point exposurePoint;
   private MeteringRectangle exposureRectangle;
   @NonNull private final SensorOrientationFeature sensorOrientationFeature;
+  private boolean defaultRegionsHasBeenSet = false;
+  @VisibleForTesting @Nullable public MeteringRectangle[] defaultRegions;
 
   /**
    * Creates a new instance of the {@link ExposurePointFeature}.
@@ -78,9 +81,18 @@ public void updateBuilder(@NonNull CaptureRequest.Builder requestBuilder) {
     if (!checkIsSupported()) {
       return;
     }
-    requestBuilder.set(
-        CaptureRequest.CONTROL_AE_REGIONS,
-        exposureRectangle == null ? null : new MeteringRectangle[] {exposureRectangle});
+
+    if (!defaultRegionsHasBeenSet) {
+      defaultRegions = requestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
+      defaultRegionsHasBeenSet = true;
+    }
+
+    if (exposureRectangle != null) {
+      requestBuilder.set(
+          CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[] {exposureRectangle});
+    } else {
+      requestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, defaultRegions);
+    }
   }
 
   private void buildExposureRectangle() {

packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeatureTest.java

@@ -9,7 +9,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -281,7 +281,7 @@ public void updateBuilder_shouldSetMeteringRectangleWhenValidBoundariesAndCoords
   }
 
   @Test
-  public void updateBuilder_shouldNotSetMeteringRectangleWhenNoValidBoundariesAreSupplied() {
+  public void updateBuilder_shoulSetDefaultMeteringRectangleWhenNoValidBoundariesAreSupplied() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     when(mockCameraProperties.getControlMaxRegionsAutoExposure()).thenReturn(1);
     CaptureRequest.Builder mockCaptureRequestBuilder = mock(CaptureRequest.Builder.class);
@@ -290,24 +290,52 @@ public void updateBuilder_shouldNotSetMeteringRectangleWhenNoValidBoundariesAreS
 
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
 
-    verify(mockCaptureRequestBuilder, times(1)).set(any(), isNull());
+    verify(mockCaptureRequestBuilder, times(1)).set(any(), any());
   }
 
   @Test
-  public void updateBuilder_shouldNotSetMeteringRectangleWhenNoValidCoordsAreSupplied() {
+  public void updateBuilder_shouldSetDefaultMeteringRectangleWhenNoValidCoordsAreSupplied() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     when(mockCameraProperties.getControlMaxRegionsAutoExposure()).thenReturn(1);
     CaptureRequest.Builder mockCaptureRequestBuilder = mock(CaptureRequest.Builder.class);
     ExposurePointFeature exposurePointFeature =
         new ExposurePointFeature(mockCameraProperties, mockSensorOrientationFeature);
     exposurePointFeature.setCameraBoundaries(this.mockCameraBoundaries);
 
+    MeteringRectangle[] defaultRegions =
+        new MeteringRectangle[] {new MeteringRectangle(0, 0, 100, 100, 0)};
+    when(mockCaptureRequestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS))
+        .thenReturn(defaultRegions);
+
     exposurePointFeature.setValue(null);
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
     exposurePointFeature.setValue(new Point(0d, null));
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
     exposurePointFeature.setValue(new Point(null, 0d));
     exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
-    verify(mockCaptureRequestBuilder, times(3)).set(any(), isNull());
+
+    verify(mockCaptureRequestBuilder, times(3)).set(any(), eq(defaultRegions));
+  }
+
+  @Test
+  public void updateBuilder_shouldSetNonNullMeteringRectangleWhenNullValueIsSupplied() {
+    CameraProperties mockCameraProperties = mock(CameraProperties.class);
+    when(mockCameraProperties.getControlMaxRegionsAutoExposure()).thenReturn(1);
+    CaptureRequest.Builder mockCaptureRequestBuilder = mock(CaptureRequest.Builder.class);
+    ExposurePointFeature exposurePointFeature =
+        new ExposurePointFeature(mockCameraProperties, mockSensorOrientationFeature);
+
+    MeteringRectangle[] defaultRegions =
+        new MeteringRectangle[] {new MeteringRectangle(0, 0, 100, 100, 0)};
+    when(mockCaptureRequestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS))
+        .thenReturn(defaultRegions);
+
+    exposurePointFeature.setCameraBoundaries(this.mockCameraBoundaries);
+
+    exposurePointFeature.setValue(null);
+
+    exposurePointFeature.updateBuilder(mockCaptureRequestBuilder);
+
+    verify(mockCaptureRequestBuilder, times(1)).set(any(), eq(exposurePointFeature.defaultRegions));
   }
 }

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.8+4
+version: 0.10.8+5
 
 environment:
   sdk: ">=2.18.0 <4.0.0"

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.0+12
+
+* Wraps classes needed to implement resolution configuration for image capture, image analysis, and preview.
+* Removes usages of deprecated APIs for resolution configuration.
+* Bumps CameraX version to 1.3.0-beta01.
+
 ## 0.5.0+11
 
 * Fixes issue with image data not being emitted after relistening to stream returned by `onStreamedFrameAvailable`.