Merge branch 'master' into notta

* master: (153 commits)
  Roll Flutter from fd360c4 to ef5a6da (1 revision) (flutter#5298)
  [video_player_avfoundation] Applies the standardized transform for videos with different orientations (flutter#5069)
  Roll Flutter from 3752fb7 to fd360c4 (2 revisions) (flutter#5295)
  Roll Flutter from 3c4d7a1 to 3752fb7 (11 revisions) (flutter#5294)
  Add owners for Android implementations (flutter#5293)
  Roll Flutter from f4875ae to 3c4d7a1 (2 revisions) (flutter#5292)
  [video_player_web] Stop buffering when browser canPlayThrough. (flutter#5068)
  Roll Flutter from aa5d7b6 to f4875ae (1 revision) (flutter#5289)
  Roll Flutter from 44be0b8 to aa5d7b6 (12 revisions) (flutter#5286)
  Roll Flutter from ec8289c to 44be0b8 (2 revisions) (flutter#5284)
  Roll Flutter from 329ceae to ec8289c (26 revisions) (flutter#5283)
  [flutter_plugin_tools] Preserve Dart SDK version in all-plugins-app (flutter#5281)
  [webview_flutter_wkwebview] Implements the `HostApis` and methods for the `CookieManager`. (flutter#5244)
  [webview_flutter_wkwebview] Implement `WKNavigationDelegate.didFinishNavigation` as a proof of concept for callback methods (flutter#5199)
  Roll Flutter from 08e467d to 2b83332 (5 revisions) (flutter#5270)
  Roll Flutter from e2d1206 to 08e467d (1 revision) (flutter#5268)
  Roll Flutter from ff9d6e5 to e2d1206 (2 revisions) (flutter#5266)
  Roll Flutter from 0575932 to ff9d6e5 (1 revision) (flutter#5265)
  [local_auth] Refactor package to make use of new platform interface and native implementations (flutter#4701)
  Roll Flutter from cb968c5 to 0575932 (1 revision) (flutter#5263)
  ...

Author: Lo_pat

.ci/flutter_master.version

@@ -1 +1 @@
-a491a81f78739dc1c801529b98239adc6a2dd361
+ef5a6da35a72dcd89cabb06f4e075801ea260224

.cirrus.yml

@@ -28,10 +28,10 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
     - git fetch origin
     # Switch to the requested channel.
     - git checkout $TARGET_TREEISH
-    # When using a branch rather than a hash, 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" ]]; then
+    # 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.
@@ -101,6 +101,7 @@ task:
       always:
         format_script: ./script/tool_runner.sh format --fail-on-change
         pubspec_script: ./script/tool_runner.sh pubspec-check
+        readme_script: ./script/tool_runner.sh readme-check
         license_script: dart $PLUGIN_TOOL license-check
     - name: federated_safety
       # This check is only meaningful for PRs, as it validates changes
@@ -138,6 +139,22 @@ task:
         # Restore the tree to a clean state, to avoid accidental issues if
         # other script steps are added to this task.
         - git checkout .
+    # Does a sanity check that plugins at least pass analysis on the N-1 and N-2
+    # versions of Flutter stable if the plugin claims to support that version.
+    # This is to minimize accidentally making changes that break old versions
+    # (which we don't commit to supporting, but don't want to actively break)
+    # without updating the constraints.
+    # Note: The versions below should be manually updated after a new stable
+    # version comes out.
+    - name: legacy-version-analyze
+      depends_on: analyze
+      env:
+        matrix:
+          CHANNEL: "2.5.3"
+          CHANNEL: "2.8.1"
+      analyze_script:
+        - ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml
+        - echo "If this test fails, the minumum Flutter version should be updated"
     ### Web tasks ###
     - name: web-build_all_plugins
       env:

.github/workflows/scorecards-analysis.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@b614d455ee90608b5e36e3299cd50d457eb37d5f # v1.0.3
+        uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -40,14 +40,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
+        uses: github/codeql-action/upload-sarif@f5d822707ee6e8fb81b04a5c0040b736da22e587
         with:
           sarif_file: results.sarif

AUTHORS

@@ -66,3 +66,4 @@ Alex Li <[email protected]>
 Rahul Raj <[email protected]>
 Daniel Roek <[email protected]>
 TheOneWithTheBraid <[email protected]>
+Rulong Chen（陈汝龙） <[email protected]>

CODEOWNERS

@@ -9,4 +9,18 @@ packages/webview_flutter/**                    @bparrishMines
 
 # Sub-package-level rules. These should stay last, since the last matching
 # entry takes precedence.
-packages/**/*_web/**                           @ditman
+
+# - Web
+packages/**/*_web/**                                     @ditman
+
+# - Android
+packages/camera/android/**                               @camsim99
+packages/google_maps_flutter/android/**                  @GaryQian
+packages/google_sign_in/google_sign_in_android/**        @camsim99
+packages/image_picker/image_picker_android/**            @GaryQian
+packages/in_app_purchase/in_app_purchase_android/**      @blasten
+packages/local_auth/local_auth_android/**                @blasten
+packages/path_provider/path_provider_android/**          @camsim99
+packages/quick_actions/quick_actions_android/**          @camsim99
+packages/url_launcher/url_launcher_android/**            @GaryQian
+packages/video_player/video_player_android/**            @blasten

packages/camera/camera/CHANGELOG.md

@@ -1,6 +1,24 @@
-## NEXT
+## 0.9.4+19
 
-* Minor iOS internal code cleanup related to queue helper functions.  
+* Migrate deprecated Scaffold SnackBar methods to ScaffoldMessenger.
+
+## 0.9.4+18
+
+* Fixes a crash in iOS when streaming on low-performance devices.
+
+## 0.9.4+17
+
+* Removes obsolete information from README, and adds OS support table.
+
+## 0.9.4+16
+
+* Fixes a bug resulting in a `CameraAccessException` that prevents image
+  capture on some Android devices.
+
+## 0.9.4+15
+
+* Uses dispatch queue for pixel buffer synchronization on iOS.
+* Minor iOS internal code cleanup related to queue helper functions.
 
 ## 0.9.4+14
 

packages/camera/camera/README.md

@@ -4,7 +4,9 @@
 
 A Flutter plugin for iOS, Android and Web allowing access to the device cameras.
 
-*Note*: This plugin is still under development, and some APIs might not be available yet. We are working on a refactor which can be followed here: [issue](https://github.com/flutter/flutter/issues/31225)
+|                | Android | iOS      | Web                    |
+|----------------|---------|----------|------------------------|
+| **Support**    | SDK 21+ | iOS 10+* | [See `camera_web `][1] |
 
 ## Features
 
@@ -19,22 +21,23 @@ First, add `camera` as a [dependency in your pubspec.yaml file](https://flutter.
 
 ### iOS
 
-The camera plugin functionality works on iOS 10.0 or higher. If compiling for any version lower than 10.0,
-make sure to programmatically check the version of iOS running on the device before using any camera plugin features.
+\* The camera plugin compiles for any version of iOS, but its functionality
+requires iOS 10 or higher. If compiling for iOS 9, make sure to programmatically
+check the version of iOS running on the device before using any camera plugin features.
 The [device_info_plus](https://pub.dev/packages/device_info_plus) plugin, for example, can be used to check the iOS version.
 
 Add two rows to the `ios/Runner/Info.plist`:
 
 * one with the key `Privacy - Camera Usage Description` and a usage description.
 * and one with the key `Privacy - Microphone Usage Description` and a usage description.
 
-Or in text format add the key:
+If editing `Info.plist` as text, add:
 
 ```xml
 <key>NSCameraUsageDescription</key>
-<string>Can I use the camera please?</string>
+<string>your usage description here</string>
 <key>NSMicrophoneUsageDescription</key>
-<string>Can I use the mic please?</string>
+<string>your usage description here</string>
 ```
 
 ### Android
@@ -132,6 +135,4 @@ class _CameraAppState extends State<CameraApp> {
 
 For a more elaborate usage example see [here](https://github.com/flutter/plugins/tree/main/packages/camera/camera/example).
 
-*Note*: This plugin is still under development, and some APIs might not be available yet.
-[Feedback welcome](https://github.com/flutter/flutter/issues) and
-[Pull Requests](https://github.com/flutter/plugins/pulls) are most welcome!
+[1]: https://pub.dev/packages/camera_web#limitations-on-the-web-platform

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

@@ -79,6 +79,24 @@ interface ErrorCallback {
   void onError(String errorCode, String errorMessage);
 }
 
+/** A mockable wrapper for CameraDevice calls. */
+interface CameraDeviceWrapper {
+  @NonNull
+  CaptureRequest.Builder createCaptureRequest(int templateType) throws CameraAccessException;
+
+  @TargetApi(VERSION_CODES.P)
+  void createCaptureSession(SessionConfiguration config) throws CameraAccessException;
+
+  @TargetApi(VERSION_CODES.LOLLIPOP)
+  void createCaptureSession(
+      @NonNull List<Surface> outputs,
+      @NonNull CameraCaptureSession.StateCallback callback,
+      @Nullable Handler handler)
+      throws CameraAccessException;
+
+  void close();
+}
+
 class Camera
     implements CameraCaptureCallback.CameraCaptureStateListener,
         ImageReader.OnImageAvailableListener {
@@ -114,7 +132,7 @@ class Camera
   /** An additional thread for running tasks that shouldn't block the UI. */
   private HandlerThread backgroundHandlerThread;
 
-  private CameraDevice cameraDevice;
+  private CameraDeviceWrapper cameraDevice;
   private CameraCaptureSession captureSession;
   private ImageReader pictureImageReader;
   private ImageReader imageStreamReader;
@@ -136,6 +154,44 @@ class Camera
 
   private MethodChannel.Result flutterResult;
 
+  /** A CameraDeviceWrapper implementation that forwards calls to a CameraDevice. */
+  private class DefaultCameraDeviceWrapper implements CameraDeviceWrapper {
+    private final CameraDevice cameraDevice;
+
+    private DefaultCameraDeviceWrapper(CameraDevice cameraDevice) {
+      this.cameraDevice = cameraDevice;
+    }
+
+    @NonNull
+    @Override
+    public CaptureRequest.Builder createCaptureRequest(int templateType)
+        throws CameraAccessException {
+      return cameraDevice.createCaptureRequest(templateType);
+    }
+
+    @TargetApi(VERSION_CODES.P)
+    @Override
+    public void createCaptureSession(SessionConfiguration config) throws CameraAccessException {
+      cameraDevice.createCaptureSession(config);
+    }
+
+    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @SuppressWarnings("deprecation")
+    @Override
+    public void createCaptureSession(
+        @NonNull List<Surface> outputs,
+        @NonNull CameraCaptureSession.StateCallback callback,
+        @Nullable Handler handler)
+        throws CameraAccessException {
+      cameraDevice.createCaptureSession(outputs, callback, backgroundHandler);
+    }
+
+    @Override
+    public void close() {
+      cameraDevice.close();
+    }
+  }
+
   public Camera(
       final Activity activity,
       final SurfaceTextureEntry flutterTexture,
@@ -261,7 +317,7 @@ public void open(String imageFormatGroup) throws CameraAccessException {
         new CameraDevice.StateCallback() {
           @Override
           public void onOpened(@NonNull CameraDevice device) {
-            cameraDevice = device;
+            cameraDevice = new DefaultCameraDeviceWrapper(device);
             try {
               startPreview();
               dartMessenger.sendCameraInitializedEvent(
@@ -584,7 +640,6 @@ public void onCaptureCompleted(
 
     try {
       captureSession.stopRepeating();
-      captureSession.abortCaptures();
       Log.i(TAG, "sending capture request");
       captureSession.capture(stillBuilder.build(), captureCallback, backgroundHandler);
     } catch (CameraAccessException e) {

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraTest.java

@@ -22,11 +22,15 @@
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.SessionConfiguration;
+import android.media.ImageReader;
 import android.media.MediaRecorder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.view.Surface;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleObserver;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.plugin.common.MethodChannel;
@@ -50,11 +54,39 @@
 import io.flutter.plugins.camera.features.zoomlevel.ZoomLevelFeature;
 import io.flutter.plugins.camera.utils.TestUtils;
 import io.flutter.view.TextureRegistry;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockedStatic;
 
+class FakeCameraDeviceWrapper implements CameraDeviceWrapper {
+  final List<CaptureRequest.Builder> captureRequests;
+
+  FakeCameraDeviceWrapper(List<CaptureRequest.Builder> captureRequests) {
+    this.captureRequests = captureRequests;
+  }
+
+  @NonNull
+  @Override
+  public CaptureRequest.Builder createCaptureRequest(int var1) {
+    return captureRequests.remove(0);
+  }
+
+  @Override
+  public void createCaptureSession(SessionConfiguration config) {}
+
+  @Override
+  public void createCaptureSession(
+      @NonNull List<Surface> outputs,
+      @NonNull CameraCaptureSession.StateCallback callback,
+      @Nullable Handler handler) {}
+
+  @Override
+  public void close() {}
+}
+
 public class CameraTest {
   private CameraProperties mockCameraProperties;
   private CameraFeatureFactory mockCameraFeatureFactory;
@@ -801,6 +833,29 @@ public void startBackgroundThread_shouldNotStartNewThreadWhenAlreadyCreated() {
     verify(mockHandlerThread, times(1)).start();
   }
 
+  @Test
+  public void onConverge_shouldTakePictureWithoutAbortingSession() throws CameraAccessException {
+    ArrayList<CaptureRequest.Builder> mockRequestBuilders = new ArrayList<>();
+    mockRequestBuilders.add(mock(CaptureRequest.Builder.class));
+    CameraDeviceWrapper fakeCamera = new FakeCameraDeviceWrapper(mockRequestBuilders);
+    // Stub out other features used by the flow.
+    TestUtils.setPrivateField(camera, "cameraDevice", fakeCamera);
+    TestUtils.setPrivateField(camera, "pictureImageReader", mock(ImageReader.class));
+    SensorOrientationFeature mockSensorOrientationFeature =
+        mockCameraFeatureFactory.createSensorOrientationFeature(mockCameraProperties, null, null);
+    DeviceOrientationManager mockDeviceOrientationManager = mock(DeviceOrientationManager.class);
+    when(mockSensorOrientationFeature.getDeviceOrientationManager())
+        .thenReturn(mockDeviceOrientationManager);
+
+    // Simulate a post-precapture flow.
+    camera.onConverged();
+    // A picture should be taken.
+    verify(mockCaptureSession, times(1)).capture(any(), any(), any());
+    // The session shuold not be aborted as part of this flow, as this breaks capture on some
+    // devices, and causes delays on others.
+    verify(mockCaptureSession, never()).abortCaptures();
+  }
+
   private static class TestCameraFeatureFactory implements CameraFeatureFactory {
     private final AutoFocusFeature mockAutoFocusFeature;
     private final ExposureLockFeature mockExposureLockFeature;