From b9718302b30f9883d99d5662361231d0136d35a7 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Mon, 15 May 2023 18:23:23 -0700
Subject: [PATCH] [camera] Fix Android lint issues (#3993)

Fixes the new lints that came with a recent AGP update, and removes the baseline file.

Fixes https://github.com/flutter/flutter/issues/126710
Part of https://github.com/flutter/flutter/issues/88011
---
 packages/camera/camera_android/CHANGELOG.md   |  3 ++-
 .../camera_android/android/build.gradle       |  5 ----
 .../camera_android/android/lint-baseline.xml  | 26 -------------------
 .../plugins/camera/CameraDeviceWrapper.java   |  1 -
 packages/camera/camera_android/pubspec.yaml   |  2 +-
 5 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 packages/camera/camera_android/android/lint-baseline.xml

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
index 49387767d2ff..3e81bba1ed83 100644
--- a/packages/camera/camera_android/CHANGELOG.md
+++ b/packages/camera/camera_android/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 0.10.8+1
 
+* Fixes lint errors.
 * Updates minimum supported SDK version to Flutter 3.3/Dart 2.18.
 
 ## 0.10.8
diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
index 836aeaf13670..ef8d9e297674 100644
--- a/packages/camera/camera_android/android/build.gradle
+++ b/packages/camera/camera_android/android/build.gradle
@@ -34,7 +34,6 @@ android {
     compileSdkVersion 33
 
     defaultConfig {
-        targetSdkVersion 31
         minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -48,10 +47,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lint {
-        baseline = file("lint-baseline.xml")
-    }
-
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
diff --git a/packages/camera/camera_android/android/lint-baseline.xml b/packages/camera/camera_android/android/lint-baseline.xml
deleted file mode 100644
index 7bf52079ebc2..000000000000
--- a/packages/camera/camera_android/android/lint-baseline.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2">
-
-    <issue
-        id="OldTargetApi"
-        message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the android.os.Build.VERSION_CODES javadoc for details."
-        errorLine1="        targetSdkVersion 31"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="34"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="  @TargetApi(Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/flutter/plugins/camera/CameraDeviceWrapper.java"
-            line="27"
-            column="3"/>
-    </issue>
-
-</issues>
diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraDeviceWrapper.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraDeviceWrapper.java
index 6a8a8f6bee0b..d86535c1b0a8 100644
--- a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraDeviceWrapper.java
+++ b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraDeviceWrapper.java
@@ -24,7 +24,6 @@ interface CameraDeviceWrapper {
   @TargetApi(Build.VERSION_CODES.P)
   void createCaptureSession(SessionConfiguration config) throws CameraAccessException;
 
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   void createCaptureSession(
       @NonNull List<Surface> outputs,
       @NonNull CameraCaptureSession.StateCallback callback,
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
index d5b68897d34c..9ba23af47c26 100644
--- a/packages/camera/camera_android/pubspec.yaml
+++ b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/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.8
+version: 0.10.8+1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"