diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index f7bbb4f67bd1..5e1761b65ec3 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+7 + +* Removes reference to internal `isSystemPickerAvailable$activity_release()` method. + ## 0.8.13+6 * Fixes typo in limit parameter validation error message. 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..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 @@ -10,8 +10,8 @@ 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; final class ImagePickerUtils { @@ -67,7 +67,9 @@ 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; diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index cff3b83c248d..b86be28158af 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+6 +version: 0.8.13+7 environment: sdk: ^3.9.0