Enable NewApi lint check in camera-extensions
NewApi lint check was disabled for camera tests due to a previous bug which has been fixed now. So the checks should be re-enabled now.
Bug: b/283906874
Test: ./gradlew camera:camera-extensions:lint
Change-Id: I0dd44f2c401c0f6021a291037f45fed06ac40ff9
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 4cb5a01..26e3110 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -42,6 +42,7 @@
testImplementation(project(":camera:camera-extensions-stub"))
testImplementation(libs.testCore)
// To use the extensions-stub for testing directly.
+ testImplementation(libs.testRunner)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testRunner)
diff --git a/camera/camera-extensions/lint.xml b/camera/camera-extensions/lint.xml
deleted file mode 100644
index 0843ecf..0000000
--- a/camera/camera-extensions/lint.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
- <!-- Disable NewApi lint check temporarily for unit tests.
- This file can be removed once b/200599470 is resolved. -->
- <issue id="NewApi">
- <ignore path="src/test/**" />
- </issue>
-</lint>
\ No newline at end of file
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/VersionTest.java b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/VersionTest.java
index 65294fc..337f2af 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/VersionTest.java
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/VersionTest.java
@@ -18,8 +18,11 @@
import static com.google.common.truth.Truth.assertThat;
+import androidx.test.filters.SdkSuppress;
+
import org.junit.Test;
+@SdkSuppress(minSdkVersion = 21)
public class VersionTest {
@Test
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/compat/quirk/DeviceQuirks.java b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/compat/quirk/DeviceQuirks.java
index 8d61c48..2680c7b 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/compat/quirk/DeviceQuirks.java
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/compat/quirk/DeviceQuirks.java
@@ -18,6 +18,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import androidx.camera.core.impl.Quirk;
import java.util.List;
@@ -45,6 +46,7 @@
* @return A device {@link Quirk} instance of the provided type, or {@code null} if it isn't
* found.
*/
+ @RequiresApi(21)
@SuppressWarnings("unchecked")
@Nullable
public static <T extends Quirk> T get(@NonNull final Class<T> quirkClass) {
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt
index e55cb1f..c853218 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt
@@ -20,6 +20,7 @@
import android.os.Build
import android.util.Size
import android.view.Surface
+import androidx.annotation.RequiresApi
import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImpl
import androidx.camera.extensions.impl.advanced.ImageReaderOutputConfigImpl
import androidx.camera.extensions.impl.advanced.MultiResolutionImageReaderOutputConfigImpl
@@ -37,6 +38,8 @@
private const val IMAGE_FORMAT = ImageFormat.YUV_420_888
private const val MAX_IMAGES = 2
private const val ID = 10
+
+@RequiresApi(21)
private val SIZE = Size(640, 480)
@RunWith(RobolectricTestRunner::class)
@@ -222,4 +225,4 @@
override fun getImageFormat() = format
override fun getMaxImages() = maxImages
}
-}
\ No newline at end of file
+}
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/util/ExtensionsTestUtil.kt b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/util/ExtensionsTestUtil.kt
index 445330e..297aa9d 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/util/ExtensionsTestUtil.kt
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/util/ExtensionsTestUtil.kt
@@ -16,6 +16,7 @@
package androidx.camera.extensions.internal.util
+import androidx.annotation.RequiresApi
import androidx.camera.extensions.impl.ExtensionVersionImpl
import androidx.camera.extensions.internal.ExtensionVersion
import java.lang.reflect.Field
@@ -25,6 +26,7 @@
/**
* Util functions for extensions related robolectric test
*/
+@RequiresApi(21)
object ExtensionsTestUtil {
/**
@@ -76,4 +78,4 @@
field.isAccessible = true
field[null] = mockExtensionVersionImpl
}
-}
\ No newline at end of file
+}
