Merge branch 'main' into file_selector-can-create-directories-param

Author: danferreira

.ci/flutter_master.version

@@ -1 +1 @@
-87d5b753196cd8eaec15bf4080f4dffbe0c36617
+a0820964d59cd983341dffcc824676967178df70

packages/camera/camera/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## NEXT
 
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
+* Updates README to reflect that only Android API 24+ is supported.
 
 ## 0.11.2
 

packages/camera/camera/README.md

@@ -8,7 +8,7 @@ A Flutter plugin for iOS, Android and Web allowing access to the device cameras.
 
 |                | Android | iOS       | Web                    |
 |----------------|---------|-----------|------------------------|
-| **Support**    | SDK 23+ | iOS 12.0+ | [See `camera_web `][1] |
+| **Support**    | SDK 24+ | iOS 12.0+ | [See `camera_web `][1] |
 
 ## Features
 
@@ -37,12 +37,6 @@ If editing `Info.plist` as text, add:
 
 ### Android
 
-Change the minimum Android sdk version to 23 (or higher) in your `android/app/build.gradle` file.
-
-```groovy
-minSdk = 23
-```
-
 The endorsed [`camera_android_camerax`][2] implementation of the camera plugin built with CameraX has
 better support for more devices than `camera_android`, but has some limitations; please see [this list][3]
 for more details. If you wish to use the [`camera_android`][4] implementation of the camera plugin

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.10.10+7
+
+* Updates minimum supported SDK version to Flutter 3.35.
+* Removes code for supporting API 21-23.
+
 ## 0.10.10+6
 
 * Bumps com.android.tools.build:gradle to 8.12.1.

packages/camera/camera_android/android/build.gradle

@@ -34,7 +34,7 @@ buildFeatures {
     compileSdk = 36
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

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

@@ -891,12 +891,7 @@ public void pauseVideoRecording() {
     }
 
     try {
-      if (SdkCapabilityChecker.supportsVideoPause()) {
-        mediaRecorder.pause();
-      } else {
-        throw new Messages.FlutterError(
-            "videoRecordingFailed", "pauseVideoRecording requires Android API +24.", null);
-      }
+      mediaRecorder.pause();
     } catch (IllegalStateException e) {
       throw new Messages.FlutterError("videoRecordingFailed", e.getMessage(), null);
     }
@@ -908,12 +903,7 @@ public void resumeVideoRecording() {
     }
 
     try {
-      if (SdkCapabilityChecker.supportsVideoPause()) {
-        mediaRecorder.resume();
-      } else {
-        throw new Messages.FlutterError(
-            "videoRecordingFailed", "resumeVideoRecording requires Android API +24.", null);
-      }
+      mediaRecorder.resume();
     } catch (IllegalStateException e) {
       throw new Messages.FlutterError("videoRecordingFailed", e.getMessage(), null);
     }

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraApiImpl.java

@@ -86,9 +86,6 @@ private Long instantiateCamera(String cameraName, Messages.PlatformMediaSettings
     return flutterSurfaceTexture.id();
   }
 
-  // We move catching CameraAccessException out of onMethodCall because it causes a crash
-  // on plugin registration for sdks incompatible with Camera2 (< 21). We want this plugin to
-  // to be able to compile with <21 sdks for apps that want the camera and support earlier version.
   @SuppressWarnings("ConstantConditions")
   private <T> void handleException(Exception exception, Messages.Result<T> result) {
     // The code below exactly preserves the format of the native exceptions generated by pre-Pigeon

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraProperties.java

@@ -224,7 +224,6 @@ public interface CameraProperties {
    * @return android.graphics.Rect Area of the image sensor which corresponds to active pixels prior
    *     to the application of any geometric distortion correction.
    */
-  @RequiresApi(api = VERSION_CODES.M)
   @NonNull
   Rect getSensorInfoPreCorrectionActiveArraySize();
 

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPropertiesImpl.java

@@ -140,7 +140,6 @@ public Size getSensorInfoPixelArraySize() {
     return cameraCharacteristics.get(CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE);
   }
 
-  @RequiresApi(api = VERSION_CODES.M)
   @NonNull
   @Override
   public Rect getSensorInfoPreCorrectionActiveArraySize() {

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/SdkCapabilityChecker.java

@@ -34,24 +34,12 @@ public static boolean supportsEncoderProfiles() {
     return SDK_VERSION >= Build.VERSION_CODES.S;
   }
 
-  @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.M)
-  public static boolean supportsMarshmallowNoiseReductionModes() {
-    // See https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics#NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES
-    return SDK_VERSION >= Build.VERSION_CODES.M;
-  }
-
   @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.P)
   public static boolean supportsSessionConfiguration() {
     // See https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration
     return SDK_VERSION >= Build.VERSION_CODES.P;
   }
 
-  @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.N)
-  public static boolean supportsVideoPause() {
-    // See https://developer.android.com/reference/androidx/camera/video/VideoRecordEvent.Pause
-    return SDK_VERSION >= Build.VERSION_CODES.N;
-  }
-
   @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.R)
   public static boolean supportsZoomRatio() {
     // See https://developer.android.com/reference/android/hardware/camera2/CaptureRequest#CONTROL_ZOOM_RATIO