Revert "Update lint baselines"

This reverts commit 3ac2f5e6275630db38e2aee5a7f724bdf0997232.

Reason for revert: breaking the build.

Change-Id: I88d1c4d34ca32bc1dba4d431d6c9b017e111a1c2
diff --git a/camera/camera-camera2-pipe-integration/lint-baseline.xml b/camera/camera-camera2-pipe-integration/lint-baseline.xml
index 2311254..fb33fef 100644
--- a/camera/camera-camera2-pipe-integration/lint-baseline.xml
+++ b/camera/camera-camera2-pipe-integration/lint-baseline.xml
@@ -3,6 +3,24 @@
 
     <issue
         id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                callbacks.forEach { callback -> addCaptureCallback(callback, executor) }"
+        errorLine2="                          ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/CameraCallbackMap.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="        val quirkSettings = QuirkSettingsHolder.instance().get()"
+        errorLine2="                                                           ~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/CameraQuirks.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
         message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
         errorLine1="        assertThat(fakeRequestControl.torchUpdateEventList.removeFirstKt()).isTrue()"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -57,6 +75,15 @@
 
     <issue
         id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="                    .get(2, TimeUnit.SECONDS)"
+        errorLine2="                     ~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/pipe/integration/impl/CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
         message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
         errorLine1="        assertThat(fakeRequestControl.torchUpdateEventList.removeFirstKt() == state).isTrue()"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -66,6 +93,78 @@
 
     <issue
         id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="                        postviewDeferrableSurface.surface.get()!!"
+        errorLine2="                                                          ~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/SessionProcessorManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        useCasesExpectedResultMap.keys.forEach {"
+        errorLine2="                                       ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/pipe/integration/adapter/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        useCasesExpectedDynamicRangeMap.keys.forEach {"
+        errorLine2="                                             ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/pipe/integration/adapter/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                useCases.forEach { put(it, it.currentConfig) }"
+        errorLine2="                         ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/pipe/integration/adapter/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                useCaseConfigs.forEach { put(it, supportedSizes.toList()) }"
+        errorLine2="                               ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/pipe/integration/adapter/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Map#forEach`"
+        errorLine1="        streamConfigMap.forEach { (streamConfig, deferrableSurface) ->"
+        errorLine2="                        ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/config/UseCaseCameraConfig.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        deferrableSurfaces.forEach {"
+        errorLine2="                           ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/config/UseCaseCameraConfig.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        forEach { captureConfig ->"
+        errorLine2="        ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseCameraRequestControl.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
         message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
         errorLine1="        val lastRequest = fakeCameraGraph.fakeCameraGraphSession.repeatingRequests.removeLastKt()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -110,6 +209,78 @@
     </issue>
 
     <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="                        cameraGraph.setSurface(it.id, deferrableSurface.surface.get())"
+        errorLine2="                                                                                ~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="            [email protected] { useCase ->"
+        errorLine2="                                            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="            [email protected] { useCase ->"
+        errorLine2="                                           ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="            forEach { useCase -> validatingBuilder.add(useCase.sessionConfig) }"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="            forEach { useCase -> validatingBuilder.add(useCase.sessionConfig) }"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Map#forEach`"
+        errorLine1="                        surfaceToStreamMap.forEach {"
+        errorLine2="                                           ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseSurfaceManager.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 23): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="                        if (surface == testSessionParameters.deferrableSurface.surface.get()) {"
+        errorLine2="                                                                                       ~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 23): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="                        if (surface == testSessionParameters.deferrableSurface.surface.get()) {"
+        errorLine2="                                                                                       ~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt"/>
+    </issue>
+
+    <issue
         id="CameraXQuirksClassDetector"
         message="CameraX quirks should include this template in the javadoc:&#xA;&#xA;* &lt;p>QuirkSummary&#xA;*     Bug Id:&#xA;*     Description:&#xA;*     Device(s):"
         errorLine1="public class AspectRatioLegacyApi21Quirk : Quirk {"
@@ -121,6 +292,15 @@
     <issue
         id="CameraXQuirksClassDetector"
         message="CameraX quirks should include this template in the javadoc:&#xA;&#xA;* &lt;p>QuirkSummary&#xA;*     Bug Id:&#xA;*     Description:&#xA;*     Device(s):"
+        errorLine1="public class ExcludedSupportedSizesQuirk : Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/ExcludedSupportedSizesQuirk.kt"/>
+    </issue>
+
+    <issue
+        id="CameraXQuirksClassDetector"
+        message="CameraX quirks should include this template in the javadoc:&#xA;&#xA;* &lt;p>QuirkSummary&#xA;*     Bug Id:&#xA;*     Description:&#xA;*     Device(s):"
         errorLine1="public class ExtraCroppingQuirk : Quirk {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/camera/camera-camera2-pipe-testing/lint-baseline.xml b/camera/camera-camera2-pipe-testing/lint-baseline.xml
new file mode 100644
index 0000000..bf69672
--- /dev/null
+++ b/camera/camera-camera2-pipe-testing/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha02)" variant="all" version="8.7.0-alpha02">
+
+    <issue
+        id="NewApi"
+        message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
+        errorLine1="        return pendingFrameQueue.removeFirstKt()"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/testing/CameraGraphSimulator.kt"/>
+    </issue>
+
+</issues>
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 8fa43e9..cc4e9dd 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -2,6 +2,105 @@
 <issues format="6" by="lint 8.7.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha02)" variant="all" version="8.7.0-alpha02">
 
     <issue
+        id="MissingClass"
+        message="Class referenced in the manifest, `androidx.camera.core.impl.MetadataHolderService`, was not found in the project or the libraries"
+        errorLine1="            android:name=&quot;androidx.camera.core.impl.MetadataHolderService&quot;"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                    captureConfigs.forEach { captureConfig ->"
+        errorLine2="                                   ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                    captureConfigs.forEach { captureConfig ->"
+        errorLine2="                                   ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        forEach { config ->"
+        errorLine2="        ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        forEach { config ->"
+        errorLine2="        ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                captureConfigs.forEach { captureConfig ->"
+        errorLine2="                               ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="            cameraInfos.forEach {"
+        errorLine2="                        ~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/camera2/internal/compat/workaround/ExtraSupportedSurfaceCombinationsContainerDeviceTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        useCasesExpectedSizeMap.keys.forEach {"
+        errorLine2="                                     ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="        useCasesExpectedDynamicRangeMap.keys.forEach {"
+        errorLine2="                                             ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                useCases.forEach { put(it, it.currentConfig) }"
+        errorLine2="                         ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.lang.Iterable#forEach`"
+        errorLine1="                useCaseConfigs.forEach { put(it, DEFAULT_SUPPORTED_SIZES.toList()) }"
+        errorLine2="                               ~~~~~~~">
+        <location
+            file="src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.kt"/>
+    </issue>
+
+    <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
         errorLine1="        Thread.sleep(1000);"
@@ -29,6 +128,249 @@
     </issue>
 
     <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class AfRegionFlipHorizontallyQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/AfRegionFlipHorizontallyQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class AutoFlashUnderExposedQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/AutoFlashUnderExposedQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CaptureNoResponseQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/CaptureNoResponseQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CaptureSessionOnClosedNotCalledQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/CaptureSessionOnClosedNotCalledQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CaptureSessionStuckQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/CaptureSessionStuckQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CaptureSessionStuckWhenCreatingBeforeClosingCameraQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/CaptureSessionStuckWhenCreatingBeforeClosingCameraQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class ConfigureSurfaceToSecondarySessionFailQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/ConfigureSurfaceToSecondarySessionFailQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CrashWhenTakingPhotoWithAutoFlashAEModeQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/CrashWhenTakingPhotoWithAutoFlashAEModeQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class FlashAvailabilityBufferUnderflowQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/FlashAvailabilityBufferUnderflowQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class ImageCaptureFailWithAutoFlashQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/ImageCaptureFailWithAutoFlashQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class ImageCaptureFailedForVideoSnapshotQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/ImageCaptureFailedForVideoSnapshotQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class ImageCapturePixelHDRPlusQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/ImageCapturePixelHDRPlusQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class IncorrectCaptureStateQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/IncorrectCaptureStateQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class InvalidVideoProfilesQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/InvalidVideoProfilesQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class JpegCaptureDownsizingQuirk implements SoftwareJpegEncodingPreferredQuirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/JpegCaptureDownsizingQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public final class JpegHalCorruptImageQuirk implements SoftwareJpegEncodingPreferredQuirk {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/JpegHalCorruptImageQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class LegacyCameraOutputConfigNullPointerQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/LegacyCameraOutputConfigNullPointerQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class LegacyCameraSurfaceCleanupQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/LegacyCameraSurfaceCleanupQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class Preview3AThreadCrashQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/Preview3AThreadCrashQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class PreviewOrientationIncorrectQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/PreviewOrientationIncorrectQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class PreviewPixelHDRnetQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/PreviewPixelHDRnetQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class RepeatingStreamConstraintForVideoRecordingQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/RepeatingStreamConstraintForVideoRecordingQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class StillCaptureFlashStopRepeatingQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/StillCaptureFlashStopRepeatingQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class TextureViewIsClosedQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/TextureViewIsClosedQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class TorchIsClosedAfterImageCapturingQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/TorchIsClosedAfterImageCapturingQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public final class YuvImageOnePixelShiftQuirk implements OnePixelShiftQuirk {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/YuvImageOnePixelShiftQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class ZslDisablerQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/quirk/ZslDisablerQuirk.java"/>
+    </issue>
+
+    <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
         errorLine1="                    characteristics = CameraCharacteristicsCompat.toCameraCharacteristicsCompat("
diff --git a/camera/camera-effects/lint-baseline.xml b/camera/camera-effects/lint-baseline.xml
new file mode 100644
index 0000000..348f450
--- /dev/null
+++ b/camera/camera-effects/lint-baseline.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha02)" variant="all" version="8.7.0-alpha02">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="        val inputSurface = surfaceRequest.deferrableSurface.surface.get()"
+        errorLine2="                                                                    ~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/effects/internal/SurfaceProcessorImplDeviceTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="        val inputSurface = surfaceRequest.deferrableSurface.surface.get()"
+        errorLine2="                                                                    ~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/effects/internal/SurfaceProcessorImplDeviceTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 21): `java.util.regex.Matcher#start` (called from `kotlin.text.MatchGroupCollection#get(String)`)"
+        errorLine1="        val inputSurface = surfaceRequest.deferrableSurface.surface.get()"
+        errorLine2="                                                                    ~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/effects/internal/SurfaceProcessorImplDeviceTest.kt"/>
+    </issue>
+
+</issues>
diff --git a/camera/camera-extensions/lint-baseline.xml b/camera/camera-extensions/lint-baseline.xml
index 9ffd95a..5a613f6 100644
--- a/camera/camera-extensions/lint-baseline.xml
+++ b/camera/camera-extensions/lint-baseline.xml
@@ -10,4 +10,31 @@
             file="src/main/java/androidx/camera/extensions/internal/compat/workaround/OnEnableDisableSessionDurationCheck.java"/>
     </issue>
 
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CaptureOutputSurfaceOccupiedQuirk implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/internal/compat/quirk/CaptureOutputSurfaceOccupiedQuirk.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class CrashWhenOnDisableTooSoon implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/internal/compat/quirk/CrashWhenOnDisableTooSoon.java"/>
+    </issue>
+
+    <issue
+        id="PrivateConstructorForUtilityClass"
+        message="Utility class is missing private constructor"
+        errorLine1="public class GetAvailableKeysNeedsOnInit implements Quirk {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/internal/compat/quirk/GetAvailableKeysNeedsOnInit.java"/>
+    </issue>
+
 </issues>