Merge branch 'flutter:main' into main

Author: alihassan143

.ci/flutter_master.version

@@ -1 +1 @@
-4cd734ae3a1cc0c8f132ba07e6d2e0a3253c53e7
+c07af53b3cb2182d7735f022969efb00f2ddbd27

.ci/flutter_stable.version

@@ -1 +1 @@
-ffccd96b62ee8cec7740dab303538c5fc26ac543
+e3c29ec00c9c825c891d75054c63fcc46454dca1

.cirrus.yml

@@ -64,7 +64,7 @@ macos_intel_template: &MACOS_INTEL_TEMPLATE
 macos_arm_template: &MACOS_ARM_TEMPLATE
   << : *MACOS_TEMPLATE
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:14
 
 # Light-workload Linux tasks.
 # These use default machines, with fewer CPUs, to reduce pressure on the

.github/workflows/scorecards-analysis.yml

@@ -17,6 +17,8 @@ jobs:
       security-events: write
       actions: read
       contents: read
+      # Needed to access OIDC token.
+      id-token: write
 
     steps:
       - name: "Checkout code"
@@ -25,7 +27,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564
+        uses: ossf/scorecard-action@865b4092859256271290c77adbd10a43f4779972
         with:
           results_file: results.sarif
           results_format: sarif

packages/camera/camera_android/lib/src/android_camera.dart

@@ -138,12 +138,11 @@ class AndroidCamera extends CameraPlatform {
         'cameraId': cameraId,
         'imageFormatGroup': imageFormatGroup.name(),
       },
-    )
-        // TODO(srawlins): This should return a value of the future's type. This
-        // will fail upcoming analysis checks with
-        // https://github.com/flutter/flutter/issues/105750.
-        // ignore: body_might_complete_normally_catch_error
-        .catchError(
+    ).catchError(
+      // TODO(srawlins): This should return a value of the future's type. This
+      // will fail upcoming analysis checks with
+      // https://github.com/flutter/flutter/issues/105750.
+      // ignore: body_might_complete_normally_catch_error
       (Object error, StackTrace stackTrace) {
         if (error is! PlatformException) {
           throw error;

packages/camera/camera_android_camerax/AUTHORS

@@ -2,3 +2,5 @@
 # to the Flutter project. Names should be added to the list like so:
 #
 #   Name/Organization <email address>
+
+Google Inc.

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,4 @@
 ## NEXT
 
 * Creates camera_android_camerax plugin for development.
+* Adds CameraInfo class and removes unnecessary code from plugin.

packages/camera/camera_android_camerax/android/build.gradle

@@ -22,14 +22,39 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    // CameraX dependencies require compilation against version 33 or later.
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        minSdkVersion 16
+        // Many of the CameraX APIs require API 21.
+        minSdkVersion 21
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+dependencies {
+    // CameraX core library using the camera2 implementation must use same version number.
+    def camerax_version = "1.2.0-beta01"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-inline:4.7.0'
+    testImplementation 'androidx.test:core:1.4.0'
+}
+    testOptions {
+        unitTests.includeAndroidResources = true
+        unitTests.returnDefaultValues = true
+        unitTests.all {
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
     }
 }

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

@@ -4,39 +4,69 @@
 
 package io.flutter.plugins.camerax;
 
+import android.content.Context;
 import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import io.flutter.plugin.common.MethodChannel.Result;
-
-/** CameraAndroidCameraxPlugin */
-public class CameraAndroidCameraxPlugin implements FlutterPlugin, MethodCallHandler {
-  /// The MethodChannel that will the communication between Flutter and native Android
-  ///
-  /// This local reference serves to register the plugin with the Flutter Engine and unregister it
-  /// when the Flutter Engine is detached from the Activity
-  private MethodChannel channel;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.BinaryMessenger;
+
+/** Platform implementation of the camera_plugin implemented with the CameraX library. */
+public final class CameraAndroidCameraxPlugin implements FlutterPlugin, ActivityAware {
+  private InstanceManager instanceManager;
+  private FlutterPluginBinding pluginBinding;
+
+  /**
+   * Initialize this within the {@code #configureFlutterEngine} of a Flutter activity or fragment.
+   *
+   * <p>See {@code io.flutter.plugins.camera.MainActivity} for an example.
+   */
+  public CameraAndroidCameraxPlugin() {}
+
+  void setUp(BinaryMessenger binaryMessenger, Context context) {
+    // Set up instance manager.
+    instanceManager =
+        InstanceManager.open(
+            identifier -> {
+              new GeneratedCameraXLibrary.JavaObjectFlutterApi(binaryMessenger)
+                  .dispose(identifier, reply -> {});
+            });
+
+    // Set up Host APIs.
+    GeneratedCameraXLibrary.CameraInfoHostApi.setup(
+        binaryMessenger, new CameraInfoHostApiImpl(instanceManager));
+    GeneratedCameraXLibrary.JavaObjectHostApi.setup(
+        binaryMessenger, new JavaObjectHostApiImpl(instanceManager));
+  }
 
   @Override
   public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
-    channel =
-        new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "camera_android_camerax");
-    channel.setMethodCallHandler(this);
+    pluginBinding = flutterPluginBinding;
+    (new CameraAndroidCameraxPlugin())
+        .setUp(
+            flutterPluginBinding.getBinaryMessenger(),
+            flutterPluginBinding.getApplicationContext());
   }
 
   @Override
-  public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
-    if (call.method.equals("getPlatformVersion")) {
-      result.success("Android " + android.os.Build.VERSION.RELEASE);
-    } else {
-      result.notImplemented();
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+    if (instanceManager != null) {
+      instanceManager.close();
     }
   }
 
+  // Activity Lifecycle methods:
+
   @Override
-  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
-    channel.setMethodCallHandler(null);
-  }
+  public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) {}
+
+  @Override
+  public void onDetachedFromActivityForConfigChanges() {}
+
+  @Override
+  public void onReattachedToActivityForConfigChanges(
+      @NonNull ActivityPluginBinding activityPluginBinding) {}
+
+  @Override
+  public void onDetachedFromActivity() {}
 }

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

@@ -0,0 +1,24 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.camerax;
+
+import androidx.camera.core.CameraInfo;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraInfoFlutterApi;
+
+public class CameraInfoFlutterApiImpl extends CameraInfoFlutterApi {
+  private final InstanceManager instanceManager;
+
+  public CameraInfoFlutterApiImpl(
+      BinaryMessenger binaryMessenger, InstanceManager instanceManager) {
+    super(binaryMessenger);
+    this.instanceManager = instanceManager;
+  }
+
+  void create(CameraInfo cameraInfo, Reply<Void> reply) {
+    instanceManager.addHostCreatedInstance(cameraInfo);
+    create(instanceManager.getIdentifierForStrongReference(cameraInfo), reply);
+  }
+}

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

@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.camerax;
+
+import androidx.annotation.NonNull;
+import androidx.camera.core.CameraInfo;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.CameraInfoHostApi;
+
+public class CameraInfoHostApiImpl implements CameraInfoHostApi {
+  private final InstanceManager instanceManager;
+
+  public CameraInfoHostApiImpl(InstanceManager instanceManager) {
+    this.instanceManager = instanceManager;
+  }
+
+  @Override
+  public Long getSensorRotationDegrees(@NonNull Long identifier) {
+    CameraInfo cameraInfo = (CameraInfo) instanceManager.getInstance(identifier);
+    return Long.valueOf(cameraInfo.getSensorRotationDegrees());
+  }
+}