From 31e21529514c14e4ba04cc616127f257240c6791 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 28 Oct 2025 11:18:16 -0700 Subject: [PATCH 1/3] inline the check --- .../java/io/flutter/plugins/imagepicker/ImagePickerUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java index 48c9d703ebda..74493175817d 100644 --- a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java +++ b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java @@ -10,6 +10,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; +import android.os.ext.SdkExtensions; import android.provider.MediaStore; import androidx.activity.result.contract.ActivityResultContracts; import java.util.Arrays; @@ -67,7 +68,7 @@ static boolean needRequestCameraPermission(Context context) { */ @SuppressLint({"NewApi", "ClassVerificationFailure"}) static int getMaxItems() { - if (ActivityResultContracts.PickVisualMedia.isSystemPickerAvailable$activity_release()) { + if (Build.VERSION.SDK_INT >= 33 || (Build.VERSION.SDK_INT >= 30 && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) >= 2)) { return MediaStore.getPickImagesMaxLimit(); } else { return Integer.MAX_VALUE; From 8eb9d5881dd99b633ab370de075c679353460ad6 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 28 Oct 2025 11:25:25 -0700 Subject: [PATCH 2/3] format --- .../io/flutter/plugins/imagepicker/ImagePickerUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java index 74493175817d..1499a860d7d2 100644 --- a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java +++ b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java @@ -12,7 +12,6 @@ import android.os.Build; import android.os.ext.SdkExtensions; import android.provider.MediaStore; -import androidx.activity.result.contract.ActivityResultContracts; import java.util.Arrays; final class ImagePickerUtils { @@ -68,7 +67,9 @@ static boolean needRequestCameraPermission(Context context) { */ @SuppressLint({"NewApi", "ClassVerificationFailure"}) static int getMaxItems() { - if (Build.VERSION.SDK_INT >= 33 || (Build.VERSION.SDK_INT >= 30 && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) >= 2)) { + if (Build.VERSION.SDK_INT >= 33 + || (Build.VERSION.SDK_INT >= 30 + && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) >= 2)) { return MediaStore.getPickImagesMaxLimit(); } else { return Integer.MAX_VALUE; From a57855f6154289b686d265bc6138d8102f8ee03d Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 28 Oct 2025 11:27:04 -0700 Subject: [PATCH 3/3] changelog, pubspec --- packages/image_picker/image_picker_android/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker_android/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index fc1981d33fe9..af6b98134edf 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.13+4 + +* Removes reference to internal `isSystemPickerAvailable$activity_release()` method. + ## 0.8.13+3 * Bumps androidx.exifinterface:exifinterface from 1.3.7 to 1.4.1. diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 839ea7b6a1cd..8aee712c6885 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_android description: Android implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.13+3 +version: 0.8.13+4 environment: sdk: ^3.9.0