From cf8b700d908e39193c8c87fa61401f96a83de47a Mon Sep 17 00:00:00 2001 From: Navaron Bracke Date: Mon, 30 Jan 2023 19:36:43 +0100 Subject: [PATCH 1/3] use @TargetApi instead of @SuppressWarnings --- .../plugins/camera/features/resolution/ResolutionFeature.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java index afbd7c3758a6..576a6b90450d 100644 --- a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java +++ b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java @@ -140,6 +140,7 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset) * @return The best possible {@link android.media.CamcorderProfile} that matches the supplied * {@link ResolutionPreset}. */ + @TargetApi(Build.VERSION_CODES.R) public static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPresetLegacy( int cameraId, ResolutionPreset preset) { if (cameraId < 0) { @@ -243,7 +244,6 @@ private void configureResolution(ResolutionPreset resolutionPreset, int cameraId EncoderProfiles.VideoProfile defaultVideoProfile = videoProfiles.get(0); captureSize = new Size(defaultVideoProfile.getWidth(), defaultVideoProfile.getHeight()); } else { - @SuppressWarnings("deprecation") CamcorderProfile camcorderProfile = getBestAvailableCamcorderProfileForResolutionPresetLegacy(cameraId, resolutionPreset); recordingProfileLegacy = camcorderProfile; From cab6d66994639595863000b45a5edf2a727d38dc Mon Sep 17 00:00:00 2001 From: Navaron Bracke Date: Mon, 30 Jan 2023 19:37:07 +0100 Subject: [PATCH 2/3] bump changelog --- packages/camera/camera_android/CHANGELOG.md | 5 +++++ packages/camera/camera_android/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index 0cb9957d029d..355f2f026189 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.10.4 + +* Fixes false positive for CamcorderProfile deprecation warning + that was already fixed. + ## 0.10.3 * Adds back use of Optional type. diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index fed2d29fb59f..fb3371912911 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android description: Android implementation of the camera plugin. repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.3 +version: 0.10.4 environment: sdk: ">=2.14.0 <3.0.0" From a58ee9ecd7cf8518901fed8a469739bbefe85033 Mon Sep 17 00:00:00 2001 From: Navaron Bracke Date: Sat, 18 Feb 2023 18:01:11 +0100 Subject: [PATCH 3/3] move @SuppressWarnings("deprecation") annotation; fix TODO --- .../plugins/camera/features/resolution/ResolutionFeature.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java index ae74b530d13d..f401b05ec7d3 100644 --- a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java +++ b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java @@ -125,8 +125,7 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset) } } - @SuppressWarnings("deprecation") - // TODO(camsim99): Suppression is currently safe because legacy code is used as a fallback for SDK >= S. + // TODO(camsim99): Suppression is currently safe because legacy code is used as a fallback for SDK < S. // This should be removed when reverting that fallback behavior: https://github.com/flutter/flutter/issues/119668. CamcorderProfile profile = getBestAvailableCamcorderProfileForResolutionPresetLegacy(cameraId, preset); @@ -145,6 +144,7 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset) * {@link ResolutionPreset}. */ @TargetApi(Build.VERSION_CODES.R) + @SuppressWarnings("deprecation") public static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPresetLegacy( int cameraId, ResolutionPreset preset) { if (cameraId < 0) {