[go: nahoru, domu]

Ban reflection that is not enclosed within a API check conditional

Bug: 115353070

Test: gw lintDebug before updating the baseline and see the errors.
Test: Put some of the errors inside SDK_INT checks and see the errors
disappear.

Change-Id: I887f31864455f6aa816aad7f8dd5c81bc9d54285
diff --git a/ads/ads-identifier-benchmark/lint-baseline.xml b/ads/ads-identifier-benchmark/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/ads/ads-identifier-benchmark/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/ads/ads-identifier-provider/lint-baseline.xml b/ads/ads-identifier-provider/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/ads/ads-identifier-provider/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/ads/ads-identifier-testing/lint-baseline.xml b/ads/ads-identifier-testing/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/ads/ads-identifier-testing/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/ads/ads-identifier/lint-baseline.xml b/ads/ads-identifier/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/ads/ads-identifier/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/appcompat/appcompat-resources/lint-baseline.xml b/appcompat/appcompat-resources/lint-baseline.xml
index 5bce133..73b1850 100644
--- a/appcompat/appcompat-resources/lint-baseline.xml
+++ b/appcompat/appcompat-resources/lint-baseline.xml
@@ -123,6 +123,17 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                final Object insets = getOpticalInsetsMethod.invoke(drawable);"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/DrawableUtils.java"
+            line="90"
+            column="39"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat.AnimationDrawableTransition is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
         errorLine1="                anim.setAutoCancel(true);"
diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index b76f920..7717e2d 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml
@@ -112,6 +112,149 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                info.setHomeAsUpIndicator.invoke(actionBar, drawable);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
+            line="55"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                info.setHomeActionContentDescription.invoke(actionBar, contentDescRes);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
+            line="56"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                info.setHomeActionContentDescription.invoke(actionBar, contentDescRes);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
+            line="76"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                        method.invoke(mTextView);"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java"
+            line="675"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            result = (T) method.invoke(object);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java"
+            line="847"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                mResolvedMethod.invoke(mResolvedContext, v);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/app/AppCompatViewInflater.java"
+            line="409"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            mSetExclusiveCheckableMethod.invoke(mWrappedObject, checkable);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/view/menu/MenuItemWrapperICS.java"
+            line="391"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mDoBeforeTextChanged.invoke(view);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/SearchView.java"
+            line="2073"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mDoAfterTextChanged.invoke(view);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/SearchView.java"
+            line="2083"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mEnsureImeVisible.invoke(view, /* visible = */ true);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/SearchView.java"
+            line="2093"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    return (Boolean) mMethod.invoke(mRealOwner, item);"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/view/SupportMenuInflater.java"
+            line="265"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mMethod.invoke(mRealOwner, item);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/view/SupportMenuInflater.java"
+            line="267"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                sComputeFitSystemWindowsMethod.invoke(view, inoutInsets, outLocalInsets);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ViewUtils.java"
+            line="68"
+            column="17"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.appcompat.widget.ActionBarBackgroundDrawable is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
         errorLine1="                mContainer.mSplitBackground.getOutline(outline);"
@@ -888,7 +1031,7 @@
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1053"
+            line="1059"
             column="31"/>
     </issue>
 
@@ -11985,7 +12128,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="785"
+            line="788"
             column="12"/>
     </issue>
 
@@ -11996,7 +12139,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="794"
+            line="797"
             column="28"/>
     </issue>
 
@@ -12007,7 +12150,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="889"
+            line="895"
             column="46"/>
     </issue>
 
@@ -12018,7 +12161,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="930"
+            line="936"
             column="33"/>
     </issue>
 
@@ -12029,7 +12172,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1157"
+            line="1169"
             column="22"/>
     </issue>
 
@@ -12040,7 +12183,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1222"
+            line="1234"
             column="27"/>
     </issue>
 
@@ -12051,7 +12194,7 @@
         errorLine2="              ~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1346"
+            line="1358"
             column="15"/>
     </issue>
 
@@ -12062,7 +12205,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1392"
+            line="1404"
             column="38"/>
     </issue>
 
@@ -12073,7 +12216,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1415"
+            line="1427"
             column="48"/>
     </issue>
 
@@ -12084,7 +12227,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1421"
+            line="1433"
             column="51"/>
     </issue>
 
@@ -12095,7 +12238,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1442"
+            line="1443"
             column="54"/>
     </issue>
 
diff --git a/arch/core-common/lint-baseline.xml b/arch/core-common/lint-baseline.xml
index 5f3bddd..ff8ca54 100644
--- a/arch/core-common/lint-baseline.xml
+++ b/arch/core-common/lint-baseline.xml
@@ -136,17 +136,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Entry&lt;K, V> put(@NonNull K key, @NonNull V v) {"
-        errorLine2="              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="74"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public V remove(@NonNull K key) {"
         errorLine2="           ~">
         <location
@@ -199,4 +188,15 @@
             column="12"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        public Map.Entry&lt;K, V> next() {"
+        errorLine2="               ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
+            line="344"
+            column="16"/>
+    </issue>
+
 </issues>
diff --git a/biometric/biometric/lint-baseline.xml b/biometric/biometric/lint-baseline.xml
index c3dfc0b..3eb3abe 100644
--- a/biometric/biometric/lint-baseline.xml
+++ b/biometric/biometric/lint-baseline.xml
@@ -2,6 +2,17 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                            canAuthenticateWithCrypto.invoke(mBiometricManager, crypto);"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/biometric/BiometricManager.java"
+            line="426"
+            column="29"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class null is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
         errorLine1="                            ? CryptoObjectUtils.unwrapFromBiometricPrompt(result.getCryptoObject())"
@@ -12,15 +23,4 @@
             column="82"/>
     </issue>
 
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 19, the call containing class androidx.biometric.BiometricFragment is not annotated with @RequiresApi(x) where x is at least 19. Either annotate the containing class with at least @RequiresApi(19) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(19)."
-        errorLine1="                    Objects.requireNonNull(CryptoObjectUtils.wrapForBiometricPrompt(crypto));"
-        errorLine2="                            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/BiometricFragment.java"
-            line="534"
-            column="29"/>
-    </issue>
-
 </issues>
diff --git a/biometric/integration-tests/testapp/lint-baseline.xml b/biometric/integration-tests/testapp/lint-baseline.xml
index abdad0e..58808f3 100644
--- a/biometric/integration-tests/testapp/lint-baseline.xml
+++ b/biometric/integration-tests/testapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-dev" client="gradle" variant="debug" version="4.2.0-dev">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnsafeNewApiCall"
@@ -47,17 +47,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.biometric.integration.testapp.BiometricTestActivity is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    setUserAuthenticationParameters(0 /* timeout */, keyType)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/integration/testapp/BiometricTestActivity.kt"
-            line="219"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.biometric.integration.testapp.BiometricTestActivity is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="                    setUserAuthenticationValidityDurationSeconds(-1)"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/camera/camera-camera2-pipe/lint-baseline.xml b/camera/camera-camera2-pipe/lint-baseline.xml
index 5abc72e..b0e1679 100644
--- a/camera/camera-camera2-pipe/lint-baseline.xml
+++ b/camera/camera-camera2-pipe/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="157"
+            line="159"
             column="22"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="175"
+            line="177"
             column="22"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="192"
+            line="194"
             column="22"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="210"
+            line="212"
             column="22"/>
     </issue>
 
@@ -52,250 +52,41 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="211"
+            line="213"
             column="13"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="        val sessionConfig = SessionConfiguration("
-        errorLine2="                            ^">
+        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.CameraMetadataImpl is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
+        errorLine1="                        characteristics.physicalCameraIds.orEmpty().map { CameraId(it) }.toSet()"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="220"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="            sessionConfig.inputConfiguration = InputConfiguration("
-        errorLine2="                                               ^">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="228"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="            sessionConfig.inputConfiguration = InputConfiguration("
-        errorLine2="                                               ^">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="228"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            sessionConfig.inputConfiguration = InputConfiguration("
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="228"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="        sessionConfig.sessionParameters = requestBuilder.build()"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="248"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="        cameraDevice.createCaptureSession(sessionConfig)"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="250"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraDevice is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="        cameraDevice.createReprocessCaptureRequest(inputResult)"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CameraDevice.kt"
-            line="262"
-            column="22"/>
+            file="src/main/java/androidx/camera/camera2/pipe/impl/CameraMetadataImpl.kt"
+            line="108"
+            column="41"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.CameraMetadataImpl is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                    characteristics.physicalCameraIds.orEmpty().map { CameraId(it) }.toSet()"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~">
+        errorLine1="                        characteristics.availablePhysicalCameraRequestKeys.orEmpty().toSet()"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/impl/CameraMetadataImpl.kt"
-            line="100"
-            column="37"/>
+            line="124"
+            column="41"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.CameraMetadataImpl is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                    characteristics.availablePhysicalCameraRequestKeys.orEmpty().toSet()"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        characteristics.availableSessionKeys.orEmpty().toSet()"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/impl/CameraMetadataImpl.kt"
-            line="114"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.CameraMetadataImpl is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                    characteristics.availableSessionKeys.orEmpty().toSet()"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/impl/CameraMetadataImpl.kt"
-            line="128"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraCaptureSession is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="                return cameraCaptureSession.isReprocessable"
-        errorLine2="                                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CaptureSession.kt"
-            line="296"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraCaptureSession is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="                return cameraCaptureSession.inputSurface"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CaptureSession.kt"
-            line="305"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidCameraCaptureSession is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="            cameraCaptureSession.finalizeOutputConfigurations(outputConfigs.map { it.unwrap() })"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/CaptureSession.kt"
-            line="321"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 24, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
-        errorLine1="                    OutputConfiguration(surfaceGroupId, surface)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="144"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 24, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
-        errorLine1="                    OutputConfiguration(surface)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="146"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                configuration = OutputConfiguration("
-        errorLine2="                                ^">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="160"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                    configuration.maxSharedSurfaceCount"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="187"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                this.enableSurfaceSharing()"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="198"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration.Companion is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                this.setPhysicalCameraId(physicalCameraId.value)"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="205"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                return output.surfaces"
-        errorLine2="                              ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="214"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="            output.addSurface(surface)"
-        errorLine2="                   ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="226"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.wrapper.AndroidOutputConfiguration is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            output.removeSurface(surface)"
-        errorLine2="                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/wrapper/Configuration.kt"
-            line="233"
-            column="20"/>
+            line="140"
+            column="41"/>
     </issue>
 
     <issue
@@ -311,28 +102,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.impl.Permissions is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="            context.checkSelfPermission(Manifest.permission.CAMERA) == PERMISSION_GRANTED"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/impl/Permissions.kt"
-            line="53"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.camera2.pipe.impl.AndroidMSessionFactory is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="                    InputConfiguration("
-        errorLine2="                    ^">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/impl/SessionFactory.kt"
-            line="129"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.VirtualCameraManager is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
         errorLine1="                        instance.openCamera("
         errorLine2="                                 ~~~~~~~~~~">
@@ -342,15 +111,4 @@
             column="34"/>
     </issue>
 
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.camera.camera2.pipe.impl.VirtualCameraManager is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            manager.registerAvailabilityCallback(threads.defaultExecutor, availabilityCallback)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/pipe/impl/VirtualCameraManager.kt"
-            line="318"
-            column="21"/>
-    </issue>
-
 </issues>
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index d136fc7..9c280b7 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -2,6 +2,39 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (Size) getSurfaceSize.invoke(null, surface);"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
+            line="236"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (int) detectSurfaceType.invoke(null, surface);"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
+            line="256"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (int) getGenerationId.invoke(surface);"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
+            line="272"
+            column="30"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 24, the call containing class androidx.camera.camera2.internal.Camera2CaptureCallbacks.ComboSessionCaptureCallback is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
         errorLine1="                callback.onCaptureBufferLost(session, request, surface, frame);"
@@ -85,7 +118,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/internal/compat/CameraManagerCompat.java"
-            line="264"
+            line="272"
             column="46"/>
     </issue>
 
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index 0d8d2d8..d717cfa 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -503,7 +503,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="59"
+            line="61"
             column="28"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="59"
+            line="61"
             column="45"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="69"
+            line="71"
             column="5"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="69"
+            line="71"
             column="42"/>
     </issue>
 
@@ -547,35 +547,13 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="69"
+            line="71"
             column="76"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    Size getMaxOutputSize(String cameraId, int imageFormat);"
-        errorLine2="                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="79"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    Size getPreviewSize();"
-        errorLine2="    ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="107"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public CameraInfoUnavailableException(String s, Throwable e) {"
         errorLine2="                                          ~~~~~~">
         <location
@@ -903,15 +881,4 @@
             column="21"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public UseCaseConfig&lt;?> getUseCaseConfig() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="455"
-            column="12"/>
-    </issue>
-
 </issues>
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index b2f4853..24adcb2 100644
--- a/camera/camera-testing/lint-baseline.xml
+++ b/camera/camera-testing/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="255"
+            line="257"
             column="19"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="43"
+            line="41"
             column="40"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="43"
+            line="41"
             column="57"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="            ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="44"
+            line="42"
             column="13"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="56"
+            line="54"
             column="35"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="56"
+            line="54"
             column="52"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
+            line="59"
             column="12"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
+            line="59"
             column="49"/>
     </issue>
 
@@ -184,35 +184,13 @@
         errorLine2="                                                                                  ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
+            line="59"
             column="83"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Size getMaxOutputSize(String cameraId, int imageFormat) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="67"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Size getPreviewSize() {"
-        errorLine2="           ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="96"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public FakeCaptureStage(int id, CaptureConfig captureConfig) {"
         errorLine2="                                    ~~~~~~~~~~~~~">
         <location
@@ -309,48 +287,4 @@
             column="41"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static StreamConfigurationMap generateFakeStreamConfigurationMap() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="40"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static StreamConfigurationMap generateFakeStreamConfigurationMap("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="74"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            int[] supportedFormats, Size[] supportedSizes) {"
-        errorLine2="            ~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="75"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            int[] supportedFormats, Size[] supportedSizes) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="75"
-            column="37"/>
-    </issue>
-
 </issues>
diff --git a/camera/camera-view/lint-baseline.xml b/camera/camera-view/lint-baseline.xml
index d676298..1e56e2d 100644
--- a/camera/camera-view/lint-baseline.xml
+++ b/camera/camera-view/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/view/PreviewView.java"
-            line="220"
+            line="226"
             column="13"/>
     </issue>
 
diff --git a/camera/integration-tests/camerapipetestapp/lint-baseline.xml b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
index 58396a5..5d58f1b 100644
--- a/camera/integration-tests/camerapipetestapp/lint-baseline.xml
+++ b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/camera/integration/camera2/pipe/Viewfinder.kt"
-            line="311"
+            line="314"
             column="9"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/camera/integration/camera2/pipe/Viewfinder.kt"
-            line="379"
+            line="382"
             column="9"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/camera/integration/camera2/pipe/Viewfinder.kt"
-            line="405"
+            line="408"
             column="9"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt"
-            line="44"
+            line="47"
             column="43"/>
     </issue>
 
@@ -135,61 +135,6 @@
 
     <issue
         id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeBgOverlayDark100` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeBgOverlayDark100&quot;>#DD101010&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="34"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeBgRecord` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeBgRecord&quot;>#FFD00000&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="36"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeBgRecordRipple` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeBgRecordRipple&quot;>#FFE00000&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="37"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeBtnOverlay100` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeBtnOverlay100&quot;>#33404040&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="39"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeBtnOverlay200` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeBtnOverlay200&quot;>#33FFFFFF&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="40"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
         message="The resource `R.color.cameraPipeThemeFgLight700` appears to be unused"
         errorLine1="    &lt;color name=&quot;cameraPipeThemeFgLight700&quot;>#FFD0D0D0&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -201,17 +146,6 @@
 
     <issue
         id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeFgLight800` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeFgLight800&quot;>#FFF8F8F8&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="43"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
         message="The resource `R.color.cameraPipeThemeFgLight900` appears to be unused"
         errorLine1="    &lt;color name=&quot;cameraPipeThemeFgLight900&quot;>#FFFCFCFC&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -223,17 +157,6 @@
 
     <issue
         id="UnusedResources"
-        message="The resource `R.color.cameraPipeThemeFgOverlay` appears to be unused"
-        errorLine1="    &lt;color name=&quot;cameraPipeThemeFgOverlay&quot;>#33000000&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="46"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
         message="The resource `R.color.cameraPipeThemeFgAccent` appears to be unused"
         errorLine1="    &lt;color name=&quot;cameraPipeThemeFgAccent&quot;>#FF0090D0&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -265,26 +188,4 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `defaultResolution` of class `SimpleCamera` requires synthetic accessor"
-        errorLine1="                ((it.width * it.height) - (defaultResolution.width *"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt"
-            line="70"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `defaultResolution` of class `SimpleCamera` requires synthetic accessor"
-        errorLine1="                        defaultResolution.height)).absoluteValue"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt"
-            line="71"
-            column="25"/>
-    </issue>
-
 </issues>
diff --git a/camera/integration-tests/extensionstestapp/lint-baseline.xml b/camera/integration-tests/extensionstestapp/lint-baseline.xml
index 6a15c61..2efc14d 100644
--- a/camera/integration-tests/extensionstestapp/lint-baseline.xml
+++ b/camera/integration-tests/extensionstestapp/lint-baseline.xml
@@ -2,35 +2,13 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mPreviewCaptureSessionConfigured` of class `CameraExtensionsActivity` requires synthetic accessor"
-        errorLine1="                        mPreviewCaptureSessionConfigured.countDown();"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/extensions/CameraExtensionsActivity.java"
-            line="170"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `createUseCases` of class `CameraExtensionsActivity` requires synthetic accessor"
-        errorLine1="                        createUseCases();"
-        errorLine2="                        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/extensions/CameraExtensionsActivity.java"
-            line="451"
-            column="25"/>
-    </issue>
-
-    <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/extensions/CameraExtensionsActivity.java"
-            line="399"
+            line="261"
             column="29"/>
     </issue>
 
diff --git a/camera/integration-tests/timingtestapp/lint-baseline.xml b/camera/integration-tests/timingtestapp/lint-baseline.xml
index 1922480..1fddb04 100644
--- a/camera/integration-tests/timingtestapp/lint-baseline.xml
+++ b/camera/integration-tests/timingtestapp/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/antelope/CameraUtils.kt"
-            line="176"
+            line="180"
             column="51"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"
-            line="274"
+            line="279"
             column="28"/>
     </issue>
 
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index 6ca24fd..1c82182 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -2,28 +2,6 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.integration.uiwidgets.ViewPager2Activity is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="                requestPermissions("
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/uiwidgets/ViewPager2Activity.kt"
-            line="51"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.integration.uiwidgets.ViewPagerActivity is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="                requestPermissions("
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/uiwidgets/ViewPagerActivity.kt"
-            line="55"
-            column="17"/>
-    </issue>
-
-    <issue
         id="SyntheticAccessor"
         message="Access to `private` method `getMDisplayManager` of class `OrientationConfigChangesOverriddenActivity` requires synthetic accessor"
         errorLine1="                val display = mDisplayManager.getDisplay(displayId)"
diff --git a/camera/integration-tests/viewtestapp/lint-baseline.xml b/camera/integration-tests/viewtestapp/lint-baseline.xml
index 6ceb126..32ca7f0 100644
--- a/camera/integration-tests/viewtestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewtestapp/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="79"
+            line="82"
             column="45"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="80"
+            line="83"
             column="78"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="192"
+            line="198"
             column="41"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="193"
+            line="199"
             column="64"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="202"
+            line="208"
             column="41"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="203"
+            line="209"
             column="64"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="37"
+            line="41"
             column="13"/>
     </issue>
 
@@ -107,106 +107,18 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="38"
+            line="42"
             column="13"/>
     </issue>
 
     <issue
         id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                            mCameraView.setCameraLensFacing("
-        errorLine2="                            ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="214"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                            if (mCameraView.isRecording()) {"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="238"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                            if (mCameraView.getCaptureMode() == CaptureMode.MIXED) {"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="247"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                                mCameraView.setCaptureMode(CaptureMode.IMAGE);"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="248"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                            } else if (mCameraView.getCaptureMode() == CaptureMode.IMAGE) {"
-        errorLine2="                                       ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="249"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                                mCameraView.setCaptureMode(CaptureMode.VIDEO);"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="250"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mCameraView` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                                mCameraView.setCaptureMode(CaptureMode.MIXED);"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="252"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `updateModeButtonIcon` of class `CameraViewFragment` requires synthetic accessor"
-        errorLine1="                            CameraViewFragment.this.updateModeButtonIcon();"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="255"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
         message="Access to `private` method `onTap` of class `CaptureViewOnTouchListener` requires synthetic accessor"
         errorLine1="                            onTap();"
         errorLine2="                            ~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="75"
+            line="78"
             column="29"/>
     </issue>
 
@@ -217,7 +129,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="78"
+            line="81"
             column="29"/>
     </issue>
 
@@ -228,7 +140,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="79"
+            line="82"
             column="33"/>
     </issue>
 
@@ -239,7 +151,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="80"
+            line="83"
             column="66"/>
     </issue>
 
@@ -250,7 +162,7 @@
         errorLine2="                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/CaptureViewOnTouchListener.java"
-            line="84"
+            line="87"
             column="29"/>
     </issue>
 
@@ -261,24 +173,13 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/PreviewViewFragment.java"
-            line="305"
+            line="306"
             column="46"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public View onCreateView("
-        errorLine2="           ~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/CameraViewFragment.java"
-            line="272"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
new file mode 100644
index 0000000..8e8956b
--- /dev/null
+++ b/car/app/app/lint-baseline.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            enumName = (String) nameMethod.invoke(obj);"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/car/app/serialization/Bundler.java"
+            line="322"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            Object obj = converter.invoke(null, binder);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/car/app/serialization/Bundler.java"
+            line="405"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return nameMethod.invoke(null, enumName);"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/car/app/serialization/Bundler.java"
+            line="483"
+            column="20"/>
+    </issue>
+
+</issues>
diff --git a/compose/androidview/androidview/lint-baseline.xml b/compose/androidview/androidview/lint-baseline.xml
new file mode 100644
index 0000000..b6c08b1
--- /dev/null
+++ b/compose/androidview/androidview/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="        val lp = prev ?: genDefaultLayoutParams.invoke(parent) as? ViewGroup.LayoutParams"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/compose/androidview/adapters/LayoutBuilder.kt"
+            line="93"
+            column="26"/>
+    </issue>
+
+</issues>
diff --git a/compose/animation/animation/lint-baseline.xml b/compose/animation/animation/lint-baseline.xml
index a808ae2..c8e378e 100644
--- a/compose/animation/animation/lint-baseline.xml
+++ b/compose/animation/animation/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="              ~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/animation/AnimationModifier.kt"
-            line="61"
+            line="62"
             column="15"/>
     </issue>
 
diff --git a/compose/foundation/foundation-layout/lint-baseline.xml b/compose/foundation/foundation-layout/lint-baseline.xml
index 4420f4d..83a7624 100644
--- a/compose/foundation/foundation-layout/lint-baseline.xml
+++ b/compose/foundation/foundation-layout/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="                                                            ~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/foundation/layout/Intrinsic.kt"
-            line="49"
+            line="47"
             column="61"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/foundation/layout/Intrinsic.kt"
-            line="70"
+            line="68"
             column="62"/>
     </issue>
 
diff --git a/compose/foundation/foundation-text/lint-baseline.xml b/compose/foundation/foundation-text/lint-baseline.xml
index 414280b..ec5b618 100644
--- a/compose/foundation/foundation-text/lint-baseline.xml
+++ b/compose/foundation/foundation-text/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="           ^">
         <location
             file="src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt"
-            line="626"
+            line="630"
             column="12"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="    ~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt"
-            line="667"
+            line="671"
             column="5"/>
     </issue>
 
diff --git a/compose/integration-tests/lint-baseline.xml b/compose/integration-tests/lint-baseline.xml
new file mode 100644
index 0000000..6355478
--- /dev/null
+++ b/compose/integration-tests/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            freeCaches.invoke(null)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/ui/integration/test/TextBenchmarkTestRule.kt"
+            line="82"
+            column="13"/>
+    </issue>
+
+</issues>
diff --git a/compose/material/material/lint-baseline.xml b/compose/material/material/lint-baseline.xml
index 6420db6..7d9e2d4 100644
--- a/compose/material/material/lint-baseline.xml
+++ b/compose/material/material/lint-baseline.xml
@@ -4,39 +4,6 @@
     <issue
         id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
-        errorLine1="            DefaultIconSizeModifier"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/Icon.kt"
-            line="102"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ModifierInspectorInfo"
-        message="These lambda arguments are missing in the InspectorInfo: `borderParams`"
-        errorLine1="): Modifier = drawBehind {"
-        errorLine2="              ~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"
-            line="580"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="ModifierInspectorInfo"
-        message="These lambda arguments are missing in the InspectorInfo: `onValueChange`, `position`, `steps`, `value`, `valueRange`"
-        errorLine1="    return semantics {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"
-            line="360"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="ModifierInspectorInfo"
-        message="Modifiers should include inspectorInfo for the Layout Inspector"
         errorLine1=") = composed {"
         errorLine2="    ~~~~~~~~">
         <location
@@ -52,29 +19,18 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Tab.kt"
-            line="223"
+            line="221"
             column="19"/>
     </issue>
 
     <issue
         id="ModifierInspectorInfo"
-        message="These lambda arguments are missing in the InspectorInfo: `color`, `lineWidth`"
-        errorLine1="    return drawBehind {"
-        errorLine2="           ~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"
-            line="622"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
         errorLine1="    this.then(object : LayoutModifier {"
         errorLine2="              ^">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"
-            line="381"
+            line="383"
             column="15"/>
     </issue>
 
diff --git a/compose/test-utils/lint-baseline.xml b/compose/test-utils/lint-baseline.xml
index f07f740..e7b573b 100644
--- a/compose/test-utils/lint-baseline.xml
+++ b/compose/test-utils/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="346"
+            line="348"
             column="1"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="275"
+            line="277"
             column="29"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="348"
+            line="350"
             column="30"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                   ~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="351"
+            line="353"
             column="20"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="352"
+            line="354"
             column="27"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                   ~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="356"
+            line="358"
             column="20"/>
     </issue>
 
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 33f6d28..1ce1838 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -13,6 +13,28 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            getBooleanMethod?.invoke(null, &quot;debug.layout&quot;, false) as? Boolean ?: false"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
+            line="729"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            updateDisplayListIfDirtyMethod?.invoke(view)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/platform/ViewLayer.kt"
+            line="287"
+            column="13"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.compose.ui.autofill.AndroidAutofillKt is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="    var index = root.addChildCount(autofillTree.children.count())"
@@ -184,7 +206,7 @@
         errorLine2="            ~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
-            line="302"
+            line="304"
             column="13"/>
     </issue>
 
@@ -195,7 +217,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
-            line="304"
+            line="306"
             column="13"/>
     </issue>
 
@@ -250,7 +272,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="163"
+            line="164"
             column="31"/>
     </issue>
 
@@ -327,41 +349,41 @@
         errorLine2="                        ^">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/DrawModifier.kt"
-            line="170"
+            line="182"
             column="25"/>
     </issue>
 
     <issue
         id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
-        errorLine1=") = if (elevation > 0.dp || clip || opacity != 1f) {"
+        errorLine1=") = if (elevation > 0.dp || clip) {"
         errorLine2="    ^">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/draw/DrawShadow.kt"
-            line="53"
+            line="50"
             column="5"/>
     </issue>
 
     <issue
         id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
-        errorLine1="fun Modifier.focusObserver(onFocusChange: (FocusState) -> Unit): Modifier = composed {"
-        errorLine2="                                                                            ~~~~~~~~">
+        errorLine1="    return this.then(FocusObserverModifierImpl(onFocusChange))"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/FocusObserverModifier.kt"
-            line="42"
-            column="77"/>
+            line="43"
+            column="22"/>
     </issue>
 
     <issue
         id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
-        errorLine1="fun Modifier.focusRequester(focusRequester: FocusRequester): Modifier = composed {"
-        errorLine2="                                                                        ~~~~~~~~">
+        errorLine1="    return this.then(FocusRequesterModifierImpl(focusRequester))"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/FocusRequesterModifier.kt"
-            line="45"
-            column="73"/>
+            line="46"
+            column="22"/>
     </issue>
 
     <issue
@@ -444,17 +466,6 @@
     <issue
         id="ModifierInspectorInfo"
         message="Modifiers should include inspectorInfo for the Layout Inspector"
-        errorLine1="    return this.then(filter)"
-        errorLine2="                     ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/input/pointer/PointerInteropFilter.kt"
-            line="94"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="ModifierInspectorInfo"
-        message="Modifiers should include inspectorInfo for the Layout Inspector"
         errorLine1="): Modifier = composed {"
         errorLine2="              ~~~~~~~~">
         <location
@@ -573,15 +584,4 @@
             column="15"/>
     </issue>
 
-    <issue
-        id="ModifierInspectorInfo"
-        message="These lambda arguments are missing in the InspectorInfo: `tag`"
-        errorLine1="fun Modifier.testTag(tag: String) = semantics("
-        errorLine2="                                    ~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/platform/TestTag.kt"
-            line="31"
-            column="37"/>
-    </issue>
-
 </issues>
diff --git a/core/core-animation/lint-baseline.xml b/core/core-animation/lint-baseline.xml
index dc0710e..4303df1 100644
--- a/core/core-animation/lint-baseline.xml
+++ b/core/core-animation/lint-baseline.xml
@@ -2,6 +2,83 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                        Object value = convertBack(mGetter.invoke(target));"
+        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="895"
+            column="52"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                Object value = convertBack(mGetter.invoke(target));"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="941"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                mSetter.invoke(target, mTmpValueArray);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="1012"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                mSetter.invoke(target, mTmpValueArray);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="1242"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mSetter.invoke(target, mTmpValueArray);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="1341"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mSetter.invoke(target, boxedValues);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="1386"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mSetter.invoke(target, boxedValues);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
+            line="1485"
+            column="21"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.animation.PathUtils is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="            return path.approximate(precision);"
diff --git a/core/core-ktx/lint-baseline.xml b/core/core-ktx/lint-baseline.xml
index c4beed8f..205b7fa 100644
--- a/core/core-ktx/lint-baseline.xml
+++ b/core/core-ktx/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/animation/Animator.kt"
-            line="112"
+            line="124"
             column="5"/>
     </issue>
 
@@ -48,12 +48,12 @@
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 17, the call containing class androidx.core.util.AtomicFileKt is not annotated with @RequiresApi(x) where x is at least 17. Either annotate the containing class with at least @RequiresApi(17) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(17)."
-        errorLine1="inline fun AtomicFile.readBytes(): ByteArray = readFully()"
-        errorLine2="                                               ~~~~~~~~~">
+        errorLine1="public inline fun AtomicFile.readBytes(): ByteArray = readFully()"
+        errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/AtomicFile.kt"
             line="71"
-            column="48"/>
+            column="55"/>
     </issue>
 
     <issue
@@ -74,7 +74,7 @@
         errorLine2="                                        ~~~">
         <location
             file="src/main/java/androidx/core/graphics/Bitmap.kt"
-            line="112"
+            line="116"
             column="41"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Bitmap.kt"
-            line="114"
+            line="118"
             column="19"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/Bundle.kt"
-            line="92"
+            line="93"
             column="21"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                    ~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/Bundle.kt"
-            line="94"
+            line="95"
             column="21"/>
     </issue>
 
@@ -118,426 +118,426 @@
         errorLine2="                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/Bundle.kt"
-            line="96"
+            line="97"
             column="21"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun Color.component1() = getComponent(0)"
-        errorLine2="                                         ~~~~~~~~~~~~">
+        errorLine1="public inline operator fun Color.component1(): Float = getComponent(0)"
+        errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
             line="39"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun Color.component2() = getComponent(1)"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="53"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun Color.component3() = getComponent(2)"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="67"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun Color.component4() = getComponent(3)"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="81"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 24, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
-        errorLine1="inline val @receiver:ColorInt Int.luminance get() = Color.luminance(this)"
-        errorLine2="                                                          ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="199"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun @receiver:ColorInt Int.toColor(): Color = Color.valueOf(this)"
-        errorLine2="                                                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="206"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun @receiver:ColorInt Int.toColorLong() = Color.pack(this)"
-        errorLine2="                                                        ~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="214"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun @receiver:ColorLong Long.component1() = Color.red(this)"
-        errorLine2="                                                                  ~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="228"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun @receiver:ColorLong Long.component2() = Color.green(this)"
-        errorLine2="                                                                  ~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="242"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun @receiver:ColorLong Long.component3() = Color.blue(this)"
-        errorLine2="                                                                  ~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="256"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline operator fun @receiver:ColorLong Long.component4() = Color.alpha(this)"
-        errorLine2="                                                                  ~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="270"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.alpha get() = Color.alpha(this)"
-        errorLine2="                                                        ~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="279"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.red get() = Color.red(this)"
-        errorLine2="                                                      ~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="288"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.green get() = Color.green(this)"
-        errorLine2="                                                        ~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="297"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.blue get() = Color.blue(this)"
-        errorLine2="                                                       ~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="306"
             column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.luminance get() = Color.luminance(this)"
-        errorLine2="                                                            ~~~~~~~~~">
+        errorLine1="public inline operator fun Color.component2(): Float = getComponent(1)"
+        errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
-            line="313"
-            column="61"/>
+            line="53"
+            column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun @receiver:ColorLong Long.toColor(): Color = Color.valueOf(this)"
-        errorLine2="                                                             ~~~~~~~">
+        errorLine1="public inline operator fun Color.component3(): Float = getComponent(2)"
+        errorLine2="                                                       ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="67"
+            column="56"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline operator fun Color.component4(): Float = getComponent(3)"
+        errorLine2="                                                       ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="81"
+            column="56"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 24, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
+        errorLine1="    get() = Color.luminance(this)"
+        errorLine2="                  ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="200"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline fun @receiver:ColorInt Int.toColor(): Color = Color.valueOf(this)"
+        errorLine2="                                                                  ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="207"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline fun @receiver:ColorInt Int.toColorLong(): Long = Color.pack(this)"
+        errorLine2="                                                                     ~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="215"
+            column="70"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline operator fun @receiver:ColorLong Long.component1(): Float = Color.red(this)"
+        errorLine2="                                                                                ~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="229"
+            column="81"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline operator fun @receiver:ColorLong Long.component2(): Float = Color.green(this)"
+        errorLine2="                                                                                ~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="243"
+            column="81"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline operator fun @receiver:ColorLong Long.component3(): Float = Color.blue(this)"
+        errorLine2="                                                                                ~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="257"
+            column="81"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline operator fun @receiver:ColorLong Long.component4(): Float = Color.alpha(this)"
+        errorLine2="                                                                                ~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="271"
+            column="81"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    get() = Color.alpha(this)"
+        errorLine2="                  ~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="281"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    get() = Color.red(this)"
+        errorLine2="                  ~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="291"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    get() = Color.green(this)"
+        errorLine2="                  ~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="301"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    get() = Color.blue(this)"
+        errorLine2="                  ~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="311"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    get() = Color.luminance(this)"
+        errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
             line="319"
-            column="62"/>
+            column="19"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun @receiver:ColorLong Long.toColorInt() = Color.toArgb(this)"
-        errorLine2="                                                         ~~~~~~">
+        errorLine1="public inline fun @receiver:ColorLong Long.toColor(): Color = Color.valueOf(this)"
+        errorLine2="                                                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
-            line="326"
-            column="58"/>
+            line="325"
+            column="69"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.isSrgb get() = Color.isSrgb(this)"
-        errorLine2="                                                         ~~~~~~">
+        errorLine1="public inline fun @receiver:ColorLong Long.toColorInt(): Int = Color.toArgb(this)"
+        errorLine2="                                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
-            line="333"
-            column="58"/>
+            line="332"
+            column="70"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.isWideGamut get() = Color.isWideGamut(this)"
-        errorLine2="                                                              ~~~~~~~~~~~">
+        errorLine1="    get() = Color.isSrgb(this)"
+        errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
-            line="339"
-            column="63"/>
+            line="340"
+            column="19"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline val @receiver:ColorLong Long.colorSpace: ColorSpace get() = Color.colorSpace(this)"
-        errorLine2="                                                                         ~~~~~~~~~~">
+        errorLine1="    get() = Color.isWideGamut(this)"
+        errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/Color.kt"
-            line="345"
+            line="347"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline val @receiver:ColorLong Long.colorSpace: ColorSpace get() = Color.colorSpace(this)"
+        errorLine2="                                                                                ~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="353"
+            column="81"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, ColorSpace.get(colorSpace))"
+        errorLine2="          ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="365"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, ColorSpace.get(colorSpace))"
+        errorLine2="                                   ~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="365"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, colorSpace)"
+        errorLine2="          ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="377"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, ColorSpace.get(colorSpace))"
+        errorLine2="          ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="389"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, ColorSpace.get(colorSpace))"
+        errorLine2="                                   ~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="389"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    Color.convert(this, colorSpace)"
+        errorLine2="          ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="401"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    convert(ColorSpace.get(colorSpace))"
+        errorLine2="    ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="412"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="    convert(ColorSpace.get(colorSpace))"
+        errorLine2="                       ~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="412"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline infix fun Color.convertTo(colorSpace: ColorSpace): Color = convert(colorSpace)"
+        errorLine2="                                                                         ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/Color.kt"
+            line="422"
             column="74"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, ColorSpace.get(colorSpace))"
-        errorLine2="              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="357"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, ColorSpace.get(colorSpace))"
-        errorLine2="                                       ~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="357"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, colorSpace)"
-        errorLine2="              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="369"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, ColorSpace.get(colorSpace))"
-        errorLine2="              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="381"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, ColorSpace.get(colorSpace))"
-        errorLine2="                                       ~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="381"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        Color.convert(this, colorSpace)"
-        errorLine2="              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="393"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline infix fun Color.convertTo(colorSpace: ColorSpace.Named) = convert(ColorSpace.get(colorSpace))"
-        errorLine2="                                                                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="403"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline infix fun Color.convertTo(colorSpace: ColorSpace.Named) = convert(ColorSpace.get(colorSpace))"
-        errorLine2="                                                                                    ~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="403"
-            column="85"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.graphics.ColorKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline infix fun Color.convertTo(colorSpace: ColorSpace) = convert(colorSpace)"
-        errorLine2="                                                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/Color.kt"
-            line="413"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.drawable.ColorDrawableKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun Color.toDrawable() = ColorDrawable(toArgb())"
-        errorLine2="                                              ~~~~~~">
+        errorLine1="public inline fun Color.toDrawable(): ColorDrawable = ColorDrawable(toArgb())"
+        errorLine2="                                                                    ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/ColorDrawable.kt"
             line="31"
+            column="69"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.util.HalfKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline fun @receiver:HalfFloat Short.toHalf(): Half = Half.valueOf(this)"
+        errorLine2="                                                                  ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/util/Half.kt"
+            line="33"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 26, the call containing class androidx.core.util.HalfKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
+        errorLine1="public inline fun Float.toHalf(): Half = Half.valueOf(this)"
+        errorLine2="                                              ~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/util/Half.kt"
+            line="41"
             column="47"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.util.HalfKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun @receiver:HalfFloat Short.toHalf(): Half = Half.valueOf(this)"
-        errorLine2="                                                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/util/Half.kt"
-            line="33"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.util.HalfKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun Float.toHalf(): Half = Half.valueOf(this)"
-        errorLine2="                                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/util/Half.kt"
-            line="41"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.core.util.HalfKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun String.toHalf(): Half = Half.valueOf(this)"
-        errorLine2="                                        ~~~~~~~">
+        errorLine1="public inline fun String.toHalf(): Half = Half.valueOf(this)"
+        errorLine2="                                               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Half.kt"
             line="57"
-            column="41"/>
+            column="48"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.drawable.IconKt is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="inline fun Bitmap.toAdaptiveIcon(): Icon = Icon.createWithAdaptiveBitmap(this)"
-        errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="public inline fun Bitmap.toAdaptiveIcon(): Icon = Icon.createWithAdaptiveBitmap(this)"
+        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/Icon.kt"
             line="32"
-            column="49"/>
+            column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.graphics.drawable.IconKt is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="inline fun Bitmap.toIcon(): Icon = Icon.createWithBitmap(this)"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~">
+        errorLine1="public inline fun Bitmap.toIcon(): Icon = Icon.createWithBitmap(this)"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/Icon.kt"
             line="40"
-            column="41"/>
+            column="48"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.graphics.drawable.IconKt is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="inline fun Uri.toIcon(): Icon = Icon.createWithContentUri(this)"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="public inline fun Uri.toIcon(): Icon = Icon.createWithContentUri(this)"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/Icon.kt"
             line="48"
-            column="38"/>
+            column="45"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.graphics.drawable.IconKt is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="inline fun ByteArray.toIcon(): Icon = Icon.createWithData(this, 0, size)"
-        errorLine2="                                           ~~~~~~~~~~~~~~">
+        errorLine1="public inline fun ByteArray.toIcon(): Icon = Icon.createWithData(this, 0, size)"
+        errorLine2="                                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/Icon.kt"
             line="56"
-            column="44"/>
+            column="51"/>
     </issue>
 
     <issue
@@ -576,34 +576,34 @@
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline val &lt;T> LongSparseArray&lt;T>.size get() = size()"
-        errorLine2="                                               ~~~~">
+        errorLine1="public inline val &lt;T> LongSparseArray&lt;T>.size: Int get() = size()"
+        errorLine2="                                                           ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
             line="26"
-            column="48"/>
+            column="60"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline operator fun &lt;T> LongSparseArray&lt;T>.contains(key: Long) = indexOfKey(key) >= 0"
-        errorLine2="                                                                 ~~~~~~~~~~">
+        errorLine1="    indexOfKey(key) >= 0"
+        errorLine2="    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="30"
-            column="66"/>
+            line="31"
+            column="5"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline operator fun &lt;T> LongSparseArray&lt;T>.set(key: Long, value: T) = put(key, value)"
-        errorLine2="                                                                      ~~~">
+        errorLine1="public inline operator fun &lt;T> LongSparseArray&lt;T>.set(key: Long, value: T): Unit = put(key, value)"
+        errorLine2="                                                                                   ~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="34"
-            column="71"/>
+            line="35"
+            column="84"/>
     </issue>
 
     <issue
@@ -613,7 +613,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="39"
+            line="40"
             column="15"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="39"
+            line="40"
             column="34"/>
     </issue>
 
@@ -635,30 +635,30 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="39"
+            line="40"
             column="49"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline fun &lt;T> LongSparseArray&lt;T>.containsKey(key: Long) = indexOfKey(key) >= 0"
-        errorLine2="                                                           ~~~~~~~~~~">
+        errorLine1="public inline fun &lt;T> LongSparseArray&lt;T>.containsKey(key: Long): Boolean = indexOfKey(key) >= 0"
+        errorLine2="                                                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="47"
-            column="60"/>
+            line="48"
+            column="76"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline fun &lt;T> LongSparseArray&lt;T>.containsValue(value: T) = indexOfValue(value) >= 0"
-        errorLine2="                                                            ~~~~~~~~~~~~">
+        errorLine1="    indexOfValue(value) >= 0"
+        errorLine2="    ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="51"
-            column="61"/>
+            line="53"
+            column="5"/>
     </issue>
 
     <issue
@@ -668,7 +668,7 @@
         errorLine2="    ~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="56"
+            line="58"
             column="5"/>
     </issue>
 
@@ -679,30 +679,30 @@
         errorLine2="    ~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="61"
+            line="63"
             column="5"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline fun &lt;T> LongSparseArray&lt;T>.isEmpty() = size() == 0"
-        errorLine2="                                              ~~~~">
+        errorLine1="public inline fun &lt;T> LongSparseArray&lt;T>.isEmpty(): Boolean = size() == 0"
+        errorLine2="                                                              ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="65"
-            column="47"/>
+            line="67"
+            column="63"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.core.util.LongSparseArrayKt is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
-        errorLine1="inline fun &lt;T> LongSparseArray&lt;T>.isNotEmpty() = size() != 0"
-        errorLine2="                                                 ~~~~">
+        errorLine1="public inline fun &lt;T> LongSparseArray&lt;T>.isNotEmpty(): Boolean = size() != 0"
+        errorLine2="                                                                 ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="69"
-            column="50"/>
+            line="71"
+            column="66"/>
     </issue>
 
     <issue
@@ -712,7 +712,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="74"
+            line="76"
             column="17"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="75"
+            line="77"
             column="32"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="76"
+            line="78"
             column="9"/>
     </issue>
 
@@ -745,7 +745,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="89"
+            line="91"
             column="27"/>
     </issue>
 
@@ -756,7 +756,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="90"
+            line="92"
             column="16"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="90"
+            line="92"
             column="30"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="98"
+            line="100"
             column="38"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="99"
+            line="101"
             column="31"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="106"
+            line="108"
             column="38"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/LongSparseArray.kt"
-            line="107"
+            line="109"
             column="27"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="        ~~">
         <location
             file="src/main/java/androidx/core/graphics/Path.kt"
-            line="42"
+            line="43"
             column="9"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="        ~~">
         <location
             file="src/main/java/androidx/core/graphics/Path.kt"
-            line="52"
+            line="53"
             column="9"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="        ~~">
         <location
             file="src/main/java/androidx/core/graphics/Path.kt"
-            line="69"
+            line="70"
             column="9"/>
     </issue>
 
@@ -855,19 +855,19 @@
         errorLine2="        ~~">
         <location
             file="src/main/java/androidx/core/graphics/Path.kt"
-            line="79"
+            line="80"
             column="9"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.os.PersistableBundleKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="fun persistableBundleOf(vararg pairs: Pair&lt;String, Any?>) = PersistableBundle(pairs.size).apply {"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="): PersistableBundle = PersistableBundle(pairs.size).apply {"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="29"
-            column="61"/>
+            line="31"
+            column="24"/>
     </issue>
 
     <issue
@@ -877,7 +877,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="32"
+            line="34"
             column="21"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="37"
+            line="39"
             column="21"/>
     </issue>
 
@@ -899,7 +899,7 @@
         errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="42"
+            line="44"
             column="26"/>
     </issue>
 
@@ -910,7 +910,7 @@
         errorLine2="                      ~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="43"
+            line="45"
             column="23"/>
     </issue>
 
@@ -921,7 +921,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="44"
+            line="46"
             column="24"/>
     </issue>
 
@@ -932,7 +932,7 @@
         errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="47"
+            line="49"
             column="26"/>
     </issue>
 
@@ -943,7 +943,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="52"
+            line="54"
             column="21"/>
     </issue>
 
@@ -954,7 +954,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="57"
+            line="59"
             column="31"/>
     </issue>
 
@@ -965,7 +965,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="58"
+            line="60"
             column="28"/>
     </issue>
 
@@ -976,7 +976,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="59"
+            line="61"
             column="29"/>
     </issue>
 
@@ -987,52 +987,52 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/PersistableBundle.kt"
-            line="67"
+            line="69"
             column="25"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline infix fun &lt;T : Comparable&lt;T>> T.rangeTo(that: T): Range&lt;T> = Range(this, that)"
-        errorLine2="                                                                    ~~~~~~~~~~~~~~~~~">
+        errorLine1="public inline infix fun &lt;T : Comparable&lt;T>> T.rangeTo(that: T): Range&lt;T> = Range(this, that)"
+        errorLine2="                                                                           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
             line="30"
-            column="69"/>
+            column="76"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun &lt;T : Comparable&lt;T>> Range&lt;T>.plus(value: T): Range&lt;T> = extend(value)"
-        errorLine2="                                                                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/util/Range.kt"
-            line="34"
-            column="77"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun &lt;T : Comparable&lt;T>> Range&lt;T>.plus(other: Range&lt;T>): Range&lt;T> = extend(other)"
+        errorLine1="public inline operator fun &lt;T : Comparable&lt;T>> Range&lt;T>.plus(value: T): Range&lt;T> = extend(value)"
         errorLine2="                                                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
-            line="38"
+            line="34"
             column="84"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline infix fun &lt;T : Comparable&lt;T>> Range&lt;T>.and(other: Range&lt;T>): Range&lt;T> = intersect(other)"
-        errorLine2="                                                                               ~~~~~~~~~">
+        errorLine1="    extend(other)"
+        errorLine2="    ~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
-            line="46"
-            column="80"/>
+            line="39"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
+        errorLine1="    intersect(other)"
+        errorLine2="    ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/util/Range.kt"
+            line="48"
+            column="5"/>
     </issue>
 
     <issue
@@ -1042,7 +1042,7 @@
         errorLine2="                                      ~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
-            line="51"
+            line="53"
             column="39"/>
     </issue>
 
@@ -1053,96 +1053,96 @@
         errorLine2="                               ~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
-            line="52"
+            line="54"
             column="32"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.RangeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="fun &lt;T : Comparable&lt;T>> ClosedRange&lt;T>.toRange(): Range&lt;T> = Range(start, endInclusive)"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="public fun &lt;T : Comparable&lt;T>> ClosedRange&lt;T>.toRange(): Range&lt;T> = Range(start, endInclusive)"
+        errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Range.kt"
-            line="57"
-            column="62"/>
+            line="59"
+            column="69"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.SizeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun Size.component1() = width"
-        errorLine2="                                        ~~~~~">
+        errorLine1="public inline operator fun Size.component1(): Int = width"
+        errorLine2="                                                    ~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"
             line="35"
-            column="41"/>
+            column="53"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.SizeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun Size.component2() = height"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="public inline operator fun Size.component2(): Int = height"
+        errorLine2="                                                    ~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"
             line="47"
-            column="41"/>
+            column="53"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.SizeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun SizeF.component1() = width"
-        errorLine2="                                         ~~~~~">
+        errorLine1="public inline operator fun SizeF.component1(): Float = width"
+        errorLine2="                                                       ~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"
             line="59"
-            column="42"/>
+            column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.core.util.SizeKt is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="inline operator fun SizeF.component2() = height"
-        errorLine2="                                         ~~~~~~">
+        errorLine1="public inline operator fun SizeF.component2(): Float = height"
+        errorLine2="                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"
             line="71"
-            column="42"/>
+            column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline val SparseLongArray.size get() = size()"
-        errorLine2="                                        ~~~~">
+        errorLine1="public inline val SparseLongArray.size: Int get() = size()"
+        errorLine2="                                                    ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
             line="26"
-            column="41"/>
+            column="53"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline operator fun SparseLongArray.contains(key: Int) = indexOfKey(key) >= 0"
-        errorLine2="                                                         ~~~~~~~~~~">
+        errorLine1="public inline operator fun SparseLongArray.contains(key: Int): Boolean = indexOfKey(key) >= 0"
+        errorLine2="                                                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
             line="30"
-            column="58"/>
+            column="74"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline operator fun SparseLongArray.set(key: Int, value: Long) = put(key, value)"
-        errorLine2="                                                                 ~~~">
+        errorLine1="public inline operator fun SparseLongArray.set(key: Int, value: Long): Unit = put(key, value)"
+        errorLine2="                                                                              ~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
             line="34"
-            column="66"/>
+            column="79"/>
     </issue>
 
     <issue
@@ -1181,34 +1181,34 @@
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline fun SparseLongArray.containsKey(key: Int) = indexOfKey(key) >= 0"
-        errorLine2="                                                   ~~~~~~~~~~">
+        errorLine1="public inline fun SparseLongArray.containsKey(key: Int): Boolean = indexOfKey(key) >= 0"
+        errorLine2="                                                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
             line="47"
-            column="52"/>
+            column="68"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline fun SparseLongArray.containsValue(value: Long) = indexOfValue(value) >= 0"
-        errorLine2="                                                        ~~~~~~~~~~~~">
+        errorLine1="public inline fun SparseLongArray.containsValue(value: Long): Boolean = indexOfValue(value) >= 0"
+        errorLine2="                                                                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
             line="51"
-            column="57"/>
+            column="73"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline fun SparseLongArray.getOrDefault(key: Int, defaultValue: Long) = get(key, defaultValue)"
-        errorLine2="                                                                        ~~~">
+        errorLine1="    get(key, defaultValue)"
+        errorLine2="    ~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="55"
-            column="73"/>
+            line="56"
+            column="5"/>
     </issue>
 
     <issue
@@ -1218,7 +1218,7 @@
         errorLine2="    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="60"
+            line="61"
             column="5"/>
     </issue>
 
@@ -1229,30 +1229,30 @@
         errorLine2="                                       ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="60"
+            line="61"
             column="40"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline fun SparseLongArray.isEmpty() = size() == 0"
-        errorLine2="                                       ~~~~">
+        errorLine1="public inline fun SparseLongArray.isEmpty(): Boolean = size() == 0"
+        errorLine2="                                                       ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="64"
-            column="40"/>
+            line="65"
+            column="56"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 18, the call containing class androidx.core.util.SparseLongArrayKt is not annotated with @RequiresApi(x) where x is at least 18. Either annotate the containing class with at least @RequiresApi(18) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(18)."
-        errorLine1="inline fun SparseLongArray.isNotEmpty() = size() != 0"
-        errorLine2="                                          ~~~~">
+        errorLine1="public inline fun SparseLongArray.isNotEmpty(): Boolean = size() != 0"
+        errorLine2="                                                          ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="68"
-            column="43"/>
+            line="69"
+            column="59"/>
     </issue>
 
     <issue
@@ -1262,7 +1262,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="73"
+            line="74"
             column="17"/>
     </issue>
 
@@ -1273,7 +1273,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="74"
+            line="75"
             column="32"/>
     </issue>
 
@@ -1284,7 +1284,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="75"
+            line="76"
             column="9"/>
     </issue>
 
@@ -1295,7 +1295,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="88"
+            line="89"
             column="27"/>
     </issue>
 
@@ -1306,7 +1306,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="89"
+            line="90"
             column="16"/>
     </issue>
 
@@ -1317,7 +1317,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="89"
+            line="90"
             column="30"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="97"
+            line="98"
             column="38"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                             ~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="98"
+            line="99"
             column="30"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="105"
+            line="106"
             column="38"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/SparseLongArray.kt"
-            line="106"
+            line="107"
             column="31"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/transition/Transition.kt"
-            line="75"
+            line="80"
             column="5"/>
     </issue>
 
diff --git a/core/core-role/lint-baseline.xml b/core/core-role/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/core/core-role/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index d57fdc1..d97d370 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-dev" client="gradle" variant="debug" version="4.2.0-dev">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="BanSynchronizedMethods"
@@ -35,6 +35,358 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    requestRelaunchActivityMethod.invoke(activityThread,"
+        errorLine2="                    ^">
+        <location
+            file="src/main/java/androidx/core/app/ActivityRecreator.java"
+            line="152"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                            performStopActivity3ParamsMethod.invoke(activityThread,"
+        errorLine2="                            ^">
+        <location
+            file="src/main/java/androidx/core/app/ActivityRecreator.java"
+            line="274"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                            performStopActivity2ParamsMethod.invoke(activityThread,"
+        errorLine2="                            ^">
+        <location
+            file="src/main/java/androidx/core/app/ActivityRecreator.java"
+            line="277"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    return (IBinder) sGetIBinderMethod.invoke(bundle, key);"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/BundleCompat.java"
+            line="60"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    sPutIBinderMethod.invoke(bundle, key, binder);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/BundleCompat.java"
+            line="84"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (String) getMethod.invoke(systemProperties, name);"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/view/DisplayCompat.java"
+            line="129"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (String) sGetScriptMethod.invoke(null, args);"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/text/ICUCompat.java"
+            line="116"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (String) sAddLikelySubtagsMethod.invoke(null, args);"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/text/ICUCompat.java"
+            line="133"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (int) icon.getClass().getMethod(&quot;getType&quot;).invoke(icon);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
+            line="1104"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (String) icon.getClass().getMethod(&quot;getResPackage&quot;).invoke(icon);"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
+            line="1132"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (int) icon.getClass().getMethod(&quot;getResId&quot;).invoke(icon);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
+            line="1161"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Uri) icon.getClass().getMethod(&quot;getUri&quot;).invoke(icon);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
+            line="1189"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (Boolean) sActionBarOnMenuKeyMethod.invoke(actionBar, event);"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/view/KeyEventDispatcher.java"
+            line="106"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                sSetWindowLayoutTypeMethod.invoke(popupWindow, layoutType);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/widget/PopupWindowCompat.java"
+            line="170"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (Integer) sGetWindowLayoutTypeMethod.invoke(popupWindow);"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/widget/PopupWindowCompat.java"
+            line="199"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    Boolean result = (Boolean) sMethodUserHandleIsAppMethod.invoke(null, uid);"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/os/ProcessCompat.java"
+            line="104"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    Boolean result = (Boolean) sMethodUserIdIsAppMethod.invoke(null, uid);"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/os/ProcessCompat.java"
+            line="141"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                            sRebaseMethod.invoke(theme);"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/content/res/ResourcesCompat.java"
+            line="541"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                        removeItemAtMethod.invoke(menu, i);"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/widget/TextViewCompat.java"
+            line="605"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Typeface) sCreateFromFamiliesWithDefault.invoke("
+        errorLine2="                              ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java"
+            line="127"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            final Boolean result = (Boolean) sAddFontWeightStyle.invoke("
+        errorLine2="                                             ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java"
+            line="138"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            final Boolean result = (Boolean) sAddFontWeightStyle.invoke("
+        errorLine2="                                             ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java"
+            line="112"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Typeface) sCreateFromFamiliesWithDefault.invoke("
+        errorLine2="                              ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java"
+            line="124"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Boolean) mAddFontFromAssetManager.invoke(family,"
+        errorLine2="                             ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java"
+            line="140"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Boolean) mAddFontFromBuffer.invoke(family,"
+        errorLine2="                             ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java"
+            line="155"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Typeface) mCreateFromFamiliesWithDefault.invoke(null /* static method */,"
+        errorLine2="                              ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java"
+            line="171"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Boolean) mFreeze.invoke(family);"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java"
+            line="183"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            mAbortCreation.invoke(family);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java"
+            line="194"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (Typeface) mCreateFromFamiliesWithDefault.invoke(null /* static method */,"
+        errorLine2="                              ^">
+        <location
+            file="src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java"
+            line="51"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            sChildrenDrawingOrderMethod.invoke(viewGroup, enabled);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/view/ViewCompat.java"
+            line="2451"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                Object viewRootImpl = sGetViewRootImplMethod.invoke(rootView);"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/view/WindowInsetsCompat.java"
+            line="1128"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                return (Boolean) sIsProjectedDrawableMethod.invoke(mDrawable);"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java"
+            line="131"
+            column="34"/>
+    </issue>
+
+    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
         errorLine1="public class AppLaunchChecker {"
@@ -107,7 +459,7 @@
         errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="758"
+            line="762"
             column="26"/>
     </issue>
 
@@ -118,7 +470,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowCompat.java"
-            line="123"
+            line="143"
             column="26"/>
     </issue>
 
@@ -129,7 +481,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowCompat.java"
-            line="139"
+            line="159"
             column="26"/>
     </issue>
 
@@ -828,17 +1180,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return mInfo.getStateDescription();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"
-            line="2813"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 19, the call containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is not annotated with @RequiresApi(x) where x is at least 19. Either annotate the containing class with at least @RequiresApi(19) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(19)."
         errorLine1="            return mInfo.getExtras().getCharSequence(STATE_DESCRIPTION_KEY);"
         errorLine2="                         ~~~~~~~~~">
@@ -850,17 +1191,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mInfo.setStateDescription(stateDescription);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"
-            line="2848"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 19, the call containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is not annotated with @RequiresApi(x) where x is at least 19. Either annotate the containing class with at least @RequiresApi(19) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(19)."
         errorLine1="            mInfo.getExtras().putCharSequence(STATE_DESCRIPTION_KEY, stateDescription);"
         errorLine2="                  ~~~~~~~~~">
@@ -3083,17 +3413,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.view.DisplayCutoutCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return new DisplayCutout(safeInsets.toPlatformInsets(), boundLeft,"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/DisplayCutoutCompat.java"
-            line="85"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 29, the call containing class androidx.core.view.DisplayCutoutCompat is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
         errorLine1="            return new DisplayCutout(safeInsets.toPlatformInsets(), boundLeft,"
         errorLine2="                   ~~~~~~~~~~~~~~~~~">
@@ -3171,17 +3490,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.view.DisplayCutoutCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return Insets.toCompatInsets(((DisplayCutout) mDisplayCutout).getWaterfallInsets());"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/DisplayCutoutCompat.java"
-            line="183"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 17, the call containing class androidx.core.hardware.display.DisplayManagerCompat is not annotated with @RequiresApi(x) where x is at least 17. Either annotate the containing class with at least @RequiresApi(17) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(17)."
         errorLine1="                    .getDisplay(displayId);"
         errorLine2="                     ~~~~~~~~~~">
@@ -3451,7 +3759,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="666"
+            line="702"
             column="56"/>
     </issue>
 
@@ -3803,7 +4111,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/HandlerCompat.java"
-            line="53"
+            line="52"
             column="28"/>
     </issue>
 
@@ -3814,7 +4122,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/HandlerCompat.java"
-            line="94"
+            line="93"
             column="28"/>
     </issue>
 
@@ -3825,7 +4133,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/HandlerCompat.java"
-            line="145"
+            line="144"
             column="28"/>
     </issue>
 
@@ -3924,7 +4232,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="533"
+            line="546"
             column="29"/>
     </issue>
 
@@ -3935,7 +4243,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="537"
+            line="550"
             column="33"/>
     </issue>
 
@@ -3946,7 +4254,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="539"
+            line="552"
             column="33"/>
     </issue>
 
@@ -3957,7 +4265,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="544"
+            line="557"
             column="29"/>
     </issue>
 
@@ -3968,7 +4276,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="547"
+            line="560"
             column="29"/>
     </issue>
 
@@ -3979,29 +4287,18 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="550"
+            line="563"
             column="29"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.graphics.drawable.IconCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    icon = Icon.createWithAdaptiveBitmapContentUri(getUri());"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="554"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.graphics.drawable.IconCompat is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="                    icon = Icon.createWithAdaptiveBitmap(BitmapFactory.decodeStream(is));"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="567"
+            line="580"
             column="33"/>
     </issue>
 
@@ -4012,7 +4309,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="569"
+            line="582"
             column="33"/>
     </issue>
 
@@ -4023,7 +4320,7 @@
         errorLine2="                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="577"
+            line="590"
             column="18"/>
     </issue>
 
@@ -4034,7 +4331,7 @@
         errorLine2="                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="580"
+            line="593"
             column="18"/>
     </issue>
 
@@ -4045,7 +4342,7 @@
         errorLine2="                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="628"
+            line="641"
             column="36"/>
     </issue>
 
@@ -4056,7 +4353,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="681"
+            line="694"
             column="32"/>
     </issue>
 
@@ -4067,7 +4364,7 @@
         errorLine2="                        ~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="1088"
+            line="1101"
             column="25"/>
     </issue>
 
@@ -4078,7 +4375,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="1116"
+            line="1129"
             column="25"/>
     </issue>
 
@@ -4089,7 +4386,7 @@
         errorLine2="                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="1145"
+            line="1158"
             column="25"/>
     </issue>
 
@@ -4100,7 +4397,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="1173"
+            line="1186"
             column="25"/>
     </issue>
 
@@ -4342,29 +4639,18 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/location/LocationManagerCompat.java"
-            line="60"
+            line="71"
             column="36"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.location.LocationManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                if (locationManager.registerGnssStatusCallback(executor, transport)) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/location/LocationManagerCompat.java"
-            line="139"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 24, the call containing class androidx.core.location.LocationManagerCompat is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
         errorLine1="                if (locationManager.registerGnssStatusCallback(transport, baseHandler)) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/location/LocationManagerCompat.java"
-            line="158"
+            line="189"
             column="37"/>
     </issue>
 
@@ -4375,7 +4661,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/location/LocationManagerCompat.java"
-            line="223"
+            line="274"
             column="37"/>
     </issue>
 
@@ -4386,7 +4672,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/location/LocationManagerCompat.java"
-            line="232"
+            line="283"
             column="37"/>
     </issue>
 
@@ -4953,28 +5239,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mParentId = channel.getParentChannelId();"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationChannelCompat.java"
-            line="297"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mConversationId = channel.getConversationId();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationChannelCompat.java"
-            line="298"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="        mBypassDnd = channel.canBypassDnd();"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -5008,17 +5272,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mImportantConversation = channel.isImportantConversation();"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationChannelCompat.java"
-            line="307"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="        NotificationChannel channel = new NotificationChannel(mId, mName, mImportance);"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5118,17 +5371,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationChannelCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            channel.setConversationId(mParentId, mConversationId);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationChannelCompat.java"
-            line="330"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.app.NotificationChannelGroupCompat is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="        this(group.getId());"
         errorLine2="                   ~~~~~">
@@ -6009,210 +6251,12 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                    new android.app.Notification.BubbleMetadata.Builder()"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6636"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            .setAutoExpandBubble(compatMetadata.getAutoExpandBubble())"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6637"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            .setDeleteIntent(compatMetadata.getDeleteIntent())"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6638"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            .setIcon(compatMetadata.getIcon().toIcon())"
-        errorLine2="                             ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6639"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            .setIntent(compatMetadata.getIntent())"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6640"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            .setSuppressNotification("
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6641"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                platformMetadataBuilder.setDesiredHeight(compatMetadata.getDesiredHeight());"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6645"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                platformMetadataBuilder.setDesiredHeightResId("
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6649"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            return platformMetadataBuilder.build();"
-        errorLine2="                                           ~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6653"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                    .setAutoExpandBubble(platformMetadata.getAutoExpandBubble())"
-        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6672"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                    .setDeleteIntent(platformMetadata.getDeleteIntent())"
-        errorLine2="                                                      ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6673"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                    .setIcon(IconCompat.createFromIcon(platformMetadata.getIcon()))"
-        errorLine2="                                                                        ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6674"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                    .setIntent(platformMetadata.getIntent())"
-        errorLine2="                                                ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6675"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                            platformMetadata.isNotificationSuppressed());"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6677"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            if (platformMetadata.getDesiredHeight() != 0) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6679"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                compatBuilder.setDesiredHeight(platformMetadata.getDesiredHeight());"
-        errorLine2="                                                                ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6680"
-            column="65"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            if (platformMetadata.getDesiredHeightResId() != 0) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6683"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat.BubbleMetadata is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                compatBuilder.setDesiredHeightResId(platformMetadata.getDesiredHeightResId());"
-        errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6684"
-            column="70"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 29, the call containing class androidx.core.app.NotificationCompat is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
         errorLine1="            return BubbleMetadata.fromPlatform(notification.getBubbleMetadata());"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6945"
+            line="7185"
             column="61"/>
     </issue>
 
@@ -6223,7 +6267,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6955"
+            line="7195"
             column="59"/>
     </issue>
 
@@ -6234,7 +6278,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6963"
+            line="7203"
             column="29"/>
     </issue>
 
@@ -6245,7 +6289,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6964"
+            line="7204"
             column="29"/>
     </issue>
 
@@ -6256,7 +6300,7 @@
         errorLine2="                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6965"
+            line="7205"
             column="29"/>
     </issue>
 
@@ -6267,7 +6311,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6966"
+            line="7206"
             column="29"/>
     </issue>
 
@@ -6278,7 +6322,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6968"
+            line="7208"
             column="39"/>
     </issue>
 
@@ -6289,7 +6333,7 @@
         errorLine2="                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6970"
+            line="7210"
             column="29"/>
     </issue>
 
@@ -6300,7 +6344,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6977"
+            line="7217"
             column="44"/>
     </issue>
 
@@ -6311,7 +6355,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6979"
+            line="7219"
             column="31"/>
     </issue>
 
@@ -6322,7 +6366,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6981"
+            line="7221"
             column="44"/>
     </issue>
 
@@ -6333,7 +6377,7 @@
         errorLine2="                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6986"
+            line="7226"
             column="24"/>
     </issue>
 
@@ -6344,7 +6388,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6990"
+            line="7230"
             column="37"/>
     </issue>
 
@@ -6355,7 +6399,7 @@
         errorLine2="                                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6992"
+            line="7232"
             column="37"/>
     </issue>
 
@@ -6366,7 +6410,7 @@
         errorLine2="                                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6996"
+            line="7236"
             column="75"/>
     </issue>
 
@@ -6377,7 +6421,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6999"
+            line="7239"
             column="24"/>
     </issue>
 
@@ -6388,7 +6432,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7001"
+            line="7241"
             column="32"/>
     </issue>
 
@@ -6399,7 +6443,7 @@
         errorLine2="                                     ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7004"
+            line="7244"
             column="38"/>
     </issue>
 
@@ -6410,7 +6454,7 @@
         errorLine2="                                                                               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7005"
+            line="7245"
             column="80"/>
     </issue>
 
@@ -6421,7 +6465,7 @@
         errorLine2="                                                                              ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7006"
+            line="7246"
             column="79"/>
     </issue>
 
@@ -6432,7 +6476,7 @@
         errorLine2="                                                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7010"
+            line="7250"
             column="86"/>
     </issue>
 
@@ -6443,7 +6487,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7126"
+            line="7366"
             column="33"/>
     </issue>
 
@@ -6454,7 +6498,7 @@
         errorLine2="                                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7234"
+            line="7474"
             column="33"/>
     </issue>
 
@@ -6465,7 +6509,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7250"
+            line="7490"
             column="33"/>
     </issue>
 
@@ -6476,7 +6520,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7262"
+            line="7502"
             column="33"/>
     </issue>
 
@@ -6487,7 +6531,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7275"
+            line="7515"
             column="33"/>
     </issue>
 
@@ -6498,7 +6542,7 @@
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7287"
+            line="7527"
             column="33"/>
     </issue>
 
@@ -6509,7 +6553,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7298"
+            line="7538"
             column="33"/>
     </issue>
 
@@ -6520,7 +6564,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7314"
+            line="7554"
             column="44"/>
     </issue>
 
@@ -6531,7 +6575,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7329"
+            line="7569"
             column="33"/>
     </issue>
 
@@ -6542,7 +6586,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7342"
+            line="7582"
             column="33"/>
     </issue>
 
@@ -7307,17 +7351,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        &amp;&amp; channelIds.contains(channel.getParentChannelId())) {"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationManagerCompat.java"
-            line="456"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.core.app.NotificationManagerCompat is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="                mNotificationManager.deleteNotificationChannel(channel.getId());"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7351,17 +7384,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.app.NotificationManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return mNotificationManager.getNotificationChannel(channelId, conversationId);"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationManagerCompat.java"
-            line="505"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class androidx.core.app.NotificationManagerCompat is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
         errorLine1="            return mNotificationManager.getNotificationChannelGroup(channelGroupId);"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9276,17 +9298,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                mInfo.mIsCached = shortcutInfo.isCached();"
-        errorLine2="                                               ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"
-            line="568"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 25, the call containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is not annotated with @RequiresApi(x) where x is at least 25. Either annotate the containing class with at least @RequiresApi(25) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(25)."
         errorLine1="            mInfo.mIsDynamic = shortcutInfo.isDynamic();"
         errorLine2="                                            ~~~~~~~~~">
@@ -9452,17 +9463,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    context.getSystemService(ShortcutManager.class).getShortcuts(matchFlags);"
-        errorLine2="                                                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="259"
-            column="69"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="            final ShortcutManager manager = context.getSystemService(ShortcutManager.class);"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~">
@@ -9710,7 +9710,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="550"
+            line="554"
             column="21"/>
     </issue>
 
@@ -9721,7 +9721,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="551"
+            line="555"
             column="22"/>
     </issue>
 
@@ -9732,7 +9732,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="578"
+            line="582"
             column="21"/>
     </issue>
 
@@ -9743,7 +9743,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="578"
+            line="582"
             column="61"/>
     </issue>
 
@@ -9754,7 +9754,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="590"
+            line="594"
             column="21"/>
     </issue>
 
@@ -9765,7 +9765,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="590"
+            line="594"
             column="61"/>
     </issue>
 
@@ -9776,7 +9776,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="601"
+            line="605"
             column="21"/>
     </issue>
 
@@ -9787,7 +9787,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="601"
+            line="605"
             column="61"/>
     </issue>
 
@@ -9798,51 +9798,29 @@
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="625"
+            line="629"
             column="17"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="        context.getSystemService(ShortcutManager.class).removeLongLivedShortcuts(shortcutIds);"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="625"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="            context.getSystemService(ShortcutManager.class).pushDynamicShortcut("
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="675"
+            line="679"
             column="21"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            context.getSystemService(ShortcutManager.class).pushDynamicShortcut("
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="675"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.core.content.pm.ShortcutManagerCompat is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="            final ShortcutManager sm = context.getSystemService(ShortcutManager.class);"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="678"
+            line="682"
             column="48"/>
     </issue>
 
@@ -9853,7 +9831,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="679"
+            line="683"
             column="20"/>
     </issue>
 
@@ -9864,7 +9842,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="682"
+            line="686"
             column="53"/>
     </issue>
 
@@ -9875,7 +9853,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="684"
+            line="688"
             column="20"/>
     </issue>
 
@@ -9886,7 +9864,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="687"
+            line="691"
             column="16"/>
     </issue>
 
@@ -9897,7 +9875,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="727"
+            line="731"
             column="64"/>
     </issue>
 
@@ -10469,7 +10447,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="754"
+            line="757"
             column="15"/>
     </issue>
 
@@ -10480,7 +10458,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="775"
+            line="778"
             column="22"/>
     </issue>
 
@@ -10491,7 +10469,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="819"
+            line="822"
             column="15"/>
     </issue>
 
@@ -10502,7 +10480,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="888"
+            line="891"
             column="22"/>
     </issue>
 
@@ -10513,7 +10491,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="938"
+            line="941"
             column="22"/>
     </issue>
 
@@ -10524,7 +10502,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="981"
+            line="984"
             column="25"/>
     </issue>
 
@@ -10535,7 +10513,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="995"
+            line="998"
             column="18"/>
     </issue>
 
@@ -10546,7 +10524,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1010"
+            line="1013"
             column="18"/>
     </issue>
 
@@ -10557,7 +10535,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1032"
+            line="1035"
             column="18"/>
     </issue>
 
@@ -10568,7 +10546,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1050"
+            line="1053"
             column="18"/>
     </issue>
 
@@ -10579,7 +10557,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1072"
+            line="1075"
             column="18"/>
     </issue>
 
@@ -10590,7 +10568,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1094"
+            line="1097"
             column="25"/>
     </issue>
 
@@ -10601,7 +10579,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1121"
+            line="1124"
             column="18"/>
     </issue>
 
@@ -10612,7 +10590,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1130"
+            line="1133"
             column="18"/>
     </issue>
 
@@ -10623,7 +10601,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1172"
+            line="1175"
             column="25"/>
     </issue>
 
@@ -10634,7 +10612,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1194"
+            line="1197"
             column="25"/>
     </issue>
 
@@ -10645,7 +10623,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1429"
+            line="1432"
             column="55"/>
     </issue>
 
@@ -10656,7 +10634,7 @@
         errorLine2="                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1524"
+            line="1527"
             column="25"/>
     </issue>
 
@@ -10667,7 +10645,7 @@
         errorLine2="                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1538"
+            line="1541"
             column="18"/>
     </issue>
 
@@ -10678,7 +10656,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1574"
+            line="1577"
             column="18"/>
     </issue>
 
@@ -10689,7 +10667,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1597"
+            line="1600"
             column="25"/>
     </issue>
 
@@ -10700,7 +10678,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1621"
+            line="1624"
             column="18"/>
     </issue>
 
@@ -10711,7 +10689,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1635"
+            line="1638"
             column="25"/>
     </issue>
 
@@ -10722,7 +10700,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1658"
+            line="1661"
             column="25"/>
     </issue>
 
@@ -10733,7 +10711,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1775"
+            line="1778"
             column="25"/>
     </issue>
 
@@ -10744,7 +10722,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1811"
+            line="1814"
             column="18"/>
     </issue>
 
@@ -10755,7 +10733,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1826"
+            line="1829"
             column="25"/>
     </issue>
 
@@ -10766,7 +10744,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1842"
+            line="1845"
             column="25"/>
     </issue>
 
@@ -10777,7 +10755,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1863"
+            line="1866"
             column="18"/>
     </issue>
 
@@ -10788,7 +10766,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1886"
+            line="1889"
             column="18"/>
     </issue>
 
@@ -10799,7 +10777,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1909"
+            line="1912"
             column="18"/>
     </issue>
 
@@ -10810,7 +10788,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1986"
+            line="1989"
             column="25"/>
     </issue>
 
@@ -10821,7 +10799,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2020"
+            line="2023"
             column="25"/>
     </issue>
 
@@ -10832,7 +10810,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2327"
+            line="2330"
             column="18"/>
     </issue>
 
@@ -10843,7 +10821,7 @@
         errorLine2="                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2338"
+            line="2341"
             column="25"/>
     </issue>
 
@@ -10854,7 +10832,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2348"
+            line="2351"
             column="18"/>
     </issue>
 
@@ -10865,7 +10843,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2359"
+            line="2362"
             column="25"/>
     </issue>
 
@@ -10876,7 +10854,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2373"
+            line="2376"
             column="18"/>
     </issue>
 
@@ -10887,7 +10865,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2395"
+            line="2398"
             column="25"/>
     </issue>
 
@@ -10898,7 +10876,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2408"
+            line="2411"
             column="25"/>
     </issue>
 
@@ -10909,7 +10887,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2419"
+            line="2422"
             column="18"/>
     </issue>
 
@@ -10920,7 +10898,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2421"
+            line="2424"
             column="18"/>
     </issue>
 
@@ -10931,7 +10909,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2464"
+            line="2467"
             column="22"/>
     </issue>
 
@@ -10942,7 +10920,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2504"
+            line="2507"
             column="19"/>
     </issue>
 
@@ -10953,7 +10931,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2508"
+            line="2511"
             column="15"/>
     </issue>
 
@@ -10964,7 +10942,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2538"
+            line="2541"
             column="44"/>
     </issue>
 
@@ -10975,7 +10953,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2566"
+            line="2569"
             column="50"/>
     </issue>
 
@@ -10986,7 +10964,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2590"
+            line="2593"
             column="18"/>
     </issue>
 
@@ -10997,7 +10975,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2605"
+            line="2608"
             column="25"/>
     </issue>
 
@@ -11008,7 +10986,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2692"
+            line="2716"
             column="25"/>
     </issue>
 
@@ -11019,7 +10997,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2705"
+            line="2729"
             column="25"/>
     </issue>
 
@@ -11030,7 +11008,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2718"
+            line="2742"
             column="18"/>
     </issue>
 
@@ -11041,7 +11019,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2732"
+            line="2756"
             column="25"/>
     </issue>
 
@@ -11052,7 +11030,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2748"
+            line="2772"
             column="18"/>
     </issue>
 
@@ -11063,7 +11041,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2754"
+            line="2778"
             column="41"/>
     </issue>
 
@@ -11074,7 +11052,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2755"
+            line="2779"
             column="34"/>
     </issue>
 
@@ -11085,7 +11063,7 @@
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2760"
+            line="2784"
             column="26"/>
     </issue>
 
@@ -11096,7 +11074,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2777"
+            line="2801"
             column="25"/>
     </issue>
 
@@ -11107,7 +11085,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2795"
+            line="2819"
             column="18"/>
     </issue>
 
@@ -11118,7 +11096,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2801"
+            line="2825"
             column="41"/>
     </issue>
 
@@ -11129,7 +11107,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2802"
+            line="2826"
             column="34"/>
     </issue>
 
@@ -11140,7 +11118,7 @@
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2807"
+            line="2831"
             column="26"/>
     </issue>
 
@@ -11151,7 +11129,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2833"
+            line="2857"
             column="18"/>
     </issue>
 
@@ -11162,7 +11140,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2856"
+            line="2880"
             column="25"/>
     </issue>
 
@@ -11173,7 +11151,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2878"
+            line="2902"
             column="25"/>
     </issue>
 
@@ -11184,7 +11162,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2897"
+            line="2921"
             column="18"/>
     </issue>
 
@@ -11195,7 +11173,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2914"
+            line="2938"
             column="25"/>
     </issue>
 
@@ -11206,7 +11184,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2943"
+            line="2967"
             column="25"/>
     </issue>
 
@@ -11217,7 +11195,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2974"
+            line="2998"
             column="25"/>
     </issue>
 
@@ -11228,7 +11206,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3198"
+            line="3222"
             column="25"/>
     </issue>
 
@@ -11239,7 +11217,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3241"
+            line="3265"
             column="25"/>
     </issue>
 
@@ -11250,7 +11228,7 @@
         errorLine2="                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3263"
+            line="3287"
             column="25"/>
     </issue>
 
@@ -11261,7 +11239,7 @@
         errorLine2="                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3274"
+            line="3298"
             column="25"/>
     </issue>
 
@@ -11272,7 +11250,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3291"
+            line="3315"
             column="25"/>
     </issue>
 
@@ -11283,7 +11261,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3305"
+            line="3329"
             column="25"/>
     </issue>
 
@@ -11294,7 +11272,7 @@
         errorLine2="                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3324"
+            line="3348"
             column="18"/>
     </issue>
 
@@ -11305,7 +11283,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3443"
+            line="3467"
             column="18"/>
     </issue>
 
@@ -11316,7 +11294,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3458"
+            line="3482"
             column="25"/>
     </issue>
 
@@ -11327,7 +11305,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3468"
+            line="3492"
             column="25"/>
     </issue>
 
@@ -11338,7 +11316,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3480"
+            line="3504"
             column="25"/>
     </issue>
 
@@ -11349,7 +11327,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3498"
+            line="3522"
             column="18"/>
     </issue>
 
@@ -11360,7 +11338,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3532"
+            line="3556"
             column="18"/>
     </issue>
 
@@ -11371,7 +11349,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3550"
+            line="3574"
             column="25"/>
     </issue>
 
@@ -11382,7 +11360,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3561"
+            line="3585"
             column="18"/>
     </issue>
 
@@ -11393,7 +11371,7 @@
         errorLine2="                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3580"
+            line="3604"
             column="25"/>
     </issue>
 
@@ -11404,7 +11382,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3600"
+            line="3624"
             column="18"/>
     </issue>
 
@@ -11415,7 +11393,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3610"
+            line="3634"
             column="22"/>
     </issue>
 
@@ -11426,7 +11404,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3621"
+            line="3645"
             column="15"/>
     </issue>
 
@@ -11437,7 +11415,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3630"
+            line="3654"
             column="15"/>
     </issue>
 
@@ -11448,7 +11426,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3642"
+            line="3666"
             column="25"/>
     </issue>
 
@@ -11459,7 +11437,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3656"
+            line="3680"
             column="18"/>
     </issue>
 
@@ -11470,7 +11448,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3668"
+            line="3692"
             column="25"/>
     </issue>
 
@@ -11481,7 +11459,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3682"
+            line="3706"
             column="18"/>
     </issue>
 
@@ -11492,7 +11470,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3697"
+            line="3721"
             column="25"/>
     </issue>
 
@@ -11503,7 +11481,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3716"
+            line="3740"
             column="18"/>
     </issue>
 
@@ -11514,7 +11492,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3734"
+            line="3758"
             column="25"/>
     </issue>
 
@@ -11525,7 +11503,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3750"
+            line="3774"
             column="18"/>
     </issue>
 
@@ -11536,7 +11514,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3764"
+            line="3788"
             column="25"/>
     </issue>
 
@@ -11547,7 +11525,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3786"
+            line="3810"
             column="25"/>
     </issue>
 
@@ -11558,7 +11536,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3799"
+            line="3823"
             column="25"/>
     </issue>
 
@@ -11569,7 +11547,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3996"
+            line="4020"
             column="29"/>
     </issue>
 
@@ -11580,7 +11558,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4002"
+            line="4026"
             column="22"/>
     </issue>
 
@@ -11591,7 +11569,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4068"
+            line="4092"
             column="29"/>
     </issue>
 
@@ -11602,29 +11580,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4074"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class null is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                return view.getStateDescription();"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4091"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class null is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                view.setStateDescription(value);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4097"
+            line="4098"
             column="22"/>
     </issue>
 
@@ -11635,7 +11591,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4148"
+            line="4172"
             column="29"/>
     </issue>
 
@@ -11646,7 +11602,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4154"
+            line="4178"
             column="22"/>
     </issue>
 
@@ -11657,7 +11613,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4249"
+            line="4273"
             column="19"/>
     </issue>
 
@@ -11668,7 +11624,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4259"
+            line="4283"
             column="19"/>
     </issue>
 
@@ -11679,7 +11635,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4266"
+            line="4290"
             column="34"/>
     </issue>
 
@@ -11690,7 +11646,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4326"
+            line="4350"
             column="22"/>
     </issue>
 
@@ -11701,7 +11657,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4357"
+            line="4381"
             column="40"/>
     </issue>
 
@@ -11998,7 +11954,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowCompat.java"
-            line="87"
+            line="89"
             column="27"/>
     </issue>
 
@@ -12217,7 +12173,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/HandlerCompat.java"
-            line="143"
+            line="142"
             column="37"/>
     </issue>
 
@@ -12250,7 +12206,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1070"
+            line="1073"
             column="13"/>
     </issue>
 
@@ -15165,7 +15121,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="435"
+            line="439"
             column="19"/>
     </issue>
 
@@ -15176,7 +15132,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="470"
+            line="504"
             column="12"/>
     </issue>
 
@@ -15187,7 +15143,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="511"
+            line="546"
             column="12"/>
     </issue>
 
@@ -15198,7 +15154,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="532"
+            line="567"
             column="12"/>
     </issue>
 
@@ -15209,7 +15165,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="532"
+            line="567"
             column="41"/>
     </issue>
 
@@ -15220,24 +15176,13 @@
         errorLine2="                                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/FileProvider.java"
-            line="541"
+            line="576"
             column="41"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/FileProvider.java"
-            line="581"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public AuthenticationResult(CryptoObject crypto) {"
         errorLine2="                                    ~~~~~~~~~~~~">
         <location
@@ -15605,7 +15550,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="169"
+            line="176"
             column="12"/>
     </issue>
 
@@ -15616,7 +15561,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="175"
+            line="182"
             column="12"/>
     </issue>
 
@@ -15627,7 +15572,7 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="199"
+            line="206"
             column="12"/>
     </issue>
 
@@ -15638,7 +15583,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="209"
+            line="216"
             column="12"/>
     </issue>
 
@@ -15649,7 +15594,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="216"
+            line="223"
             column="12"/>
     </issue>
 
@@ -15660,7 +15605,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="225"
+            line="232"
             column="19"/>
     </issue>
 
@@ -15671,7 +15616,7 @@
         errorLine2="                                                ~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="225"
+            line="232"
             column="49"/>
     </issue>
 
@@ -15682,7 +15627,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="236"
+            line="243"
             column="19"/>
     </issue>
 
@@ -15693,7 +15638,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="236"
+            line="243"
             column="49"/>
     </issue>
 
@@ -15704,7 +15649,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="236"
+            line="243"
             column="62"/>
     </issue>
 
@@ -15715,7 +15660,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="263"
+            line="270"
             column="19"/>
     </issue>
 
@@ -15726,7 +15671,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="263"
+            line="270"
             column="47"/>
     </issue>
 
@@ -15737,7 +15682,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="278"
+            line="285"
             column="19"/>
     </issue>
 
@@ -15748,7 +15693,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="278"
+            line="285"
             column="55"/>
     </issue>
 
@@ -15759,7 +15704,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="296"
+            line="303"
             column="19"/>
     </issue>
 
@@ -15770,7 +15715,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="296"
+            line="303"
             column="45"/>
     </issue>
 
@@ -15781,7 +15726,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="313"
+            line="320"
             column="19"/>
     </issue>
 
@@ -15792,7 +15737,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="313"
+            line="320"
             column="51"/>
     </issue>
 
@@ -15803,7 +15748,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="328"
+            line="335"
             column="19"/>
     </issue>
 
@@ -15814,7 +15759,7 @@
         errorLine2="                                                  ~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="328"
+            line="335"
             column="51"/>
     </issue>
 
@@ -15825,7 +15770,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="483"
+            line="496"
             column="12"/>
     </issue>
 
@@ -15836,7 +15781,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="493"
+            line="506"
             column="12"/>
     </issue>
 
@@ -15847,7 +15792,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="493"
+            line="506"
             column="35"/>
     </issue>
 
@@ -15858,7 +15803,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="504"
+            line="517"
             column="12"/>
     </issue>
 
@@ -15869,7 +15814,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/drawable/IconCompat.java"
-            line="504"
+            line="517"
             column="35"/>
     </issue>
 
@@ -18355,7 +18300,7 @@
         errorLine2="                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/res/ResourcesCompat.java"
-            line="277"
+            line="306"
             column="54"/>
     </issue>
 
@@ -18366,7 +18311,7 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/res/ResourcesCompat.java"
-            line="345"
+            line="374"
             column="19"/>
     </issue>
 
@@ -18377,7 +18322,7 @@
         errorLine2="                                                                              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/res/ResourcesCompat.java"
-            line="345"
+            line="374"
             column="79"/>
     </issue>
 
@@ -19455,7 +19400,7 @@
         errorLine2="                                                                            ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompat.java"
-            line="145"
+            line="146"
             column="77"/>
     </issue>
 
@@ -20016,7 +19961,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="530"
+            line="533"
             column="49"/>
     </issue>
 
@@ -20027,7 +19972,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="544"
+            line="547"
             column="47"/>
     </issue>
 
@@ -20038,7 +19983,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="561"
+            line="564"
             column="41"/>
     </issue>
 
@@ -20049,7 +19994,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="581"
+            line="584"
             column="42"/>
     </issue>
 
@@ -20060,7 +20005,7 @@
         errorLine2="                                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="621"
+            line="624"
             column="53"/>
     </issue>
 
@@ -20071,7 +20016,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="621"
+            line="624"
             column="61"/>
     </issue>
 
@@ -20082,7 +20027,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="653"
+            line="656"
             column="55"/>
     </issue>
 
@@ -20093,7 +20038,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="653"
+            line="656"
             column="63"/>
     </issue>
 
@@ -20104,7 +20049,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="685"
+            line="688"
             column="13"/>
     </issue>
 
@@ -20115,7 +20060,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="715"
+            line="718"
             column="30"/>
     </issue>
 
@@ -20126,7 +20071,7 @@
         errorLine2="                                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1048"
+            line="1051"
             column="60"/>
     </issue>
 
@@ -20137,7 +20082,7 @@
         errorLine2="                                                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1069"
+            line="1072"
             column="67"/>
     </issue>
 
@@ -20148,7 +20093,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1192"
+            line="1195"
             column="13"/>
     </issue>
 
@@ -20159,7 +20104,7 @@
         errorLine2="                                                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1398"
+            line="1401"
             column="61"/>
     </issue>
 
@@ -20170,7 +20115,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1427"
+            line="1430"
             column="19"/>
     </issue>
 
@@ -20181,7 +20126,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1447"
+            line="1450"
             column="34"/>
     </issue>
 
@@ -20192,7 +20137,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1486"
+            line="1489"
             column="37"/>
     </issue>
 
@@ -20203,7 +20148,7 @@
         errorLine2="                                                                         ~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1486"
+            line="1489"
             column="74"/>
     </issue>
 
@@ -20214,7 +20159,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1510"
+            line="1513"
             column="36"/>
     </issue>
 
@@ -20225,7 +20170,7 @@
         errorLine2="                                                         ~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1572"
+            line="1575"
             column="58"/>
     </issue>
 
@@ -20236,7 +20181,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1633"
+            line="1636"
             column="19"/>
     </issue>
 
@@ -20247,7 +20192,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1677"
+            line="1680"
             column="36"/>
     </issue>
 
@@ -20258,7 +20203,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1714"
+            line="1717"
             column="48"/>
     </issue>
 
@@ -20269,7 +20214,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1731"
+            line="1734"
             column="49"/>
     </issue>
 
@@ -20280,7 +20225,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1745"
+            line="1748"
             column="40"/>
     </issue>
 
@@ -20291,7 +20236,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1937"
+            line="1940"
             column="41"/>
     </issue>
 
@@ -20302,7 +20247,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1951"
+            line="1954"
             column="41"/>
     </issue>
 
@@ -20313,7 +20258,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1973"
+            line="1976"
             column="36"/>
     </issue>
 
@@ -20324,7 +20269,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2075"
+            line="2078"
             column="40"/>
     </issue>
 
@@ -20335,7 +20280,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2092"
+            line="2095"
             column="40"/>
     </issue>
 
@@ -20346,7 +20291,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2109"
+            line="2112"
             column="33"/>
     </issue>
 
@@ -20357,7 +20302,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2124"
+            line="2127"
             column="29"/>
     </issue>
 
@@ -20368,7 +20313,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2139"
+            line="2142"
             column="29"/>
     </issue>
 
@@ -20379,7 +20324,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2152"
+            line="2155"
             column="36"/>
     </issue>
 
@@ -20390,7 +20335,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2166"
+            line="2169"
             column="37"/>
     </issue>
 
@@ -20401,7 +20346,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2180"
+            line="2183"
             column="37"/>
     </issue>
 
@@ -20412,7 +20357,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2193"
+            line="2196"
             column="34"/>
     </issue>
 
@@ -20423,7 +20368,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2206"
+            line="2209"
             column="34"/>
     </issue>
 
@@ -20434,7 +20379,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2217"
+            line="2220"
             column="35"/>
     </issue>
 
@@ -20445,7 +20390,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2233"
+            line="2236"
             column="34"/>
     </issue>
 
@@ -20456,7 +20401,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2246"
+            line="2249"
             column="35"/>
     </issue>
 
@@ -20467,7 +20412,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2262"
+            line="2265"
             column="34"/>
     </issue>
 
@@ -20478,7 +20423,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2270"
+            line="2273"
             column="37"/>
     </issue>
 
@@ -20489,7 +20434,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2278"
+            line="2281"
             column="38"/>
     </issue>
 
@@ -20500,7 +20445,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2286"
+            line="2289"
             column="38"/>
     </issue>
 
@@ -20511,7 +20456,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2294"
+            line="2297"
             column="35"/>
     </issue>
 
@@ -20522,7 +20467,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2302"
+            line="2305"
             column="35"/>
     </issue>
 
@@ -20533,7 +20478,7 @@
         errorLine2="                             ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2310"
+            line="2313"
             column="30"/>
     </issue>
 
@@ -20544,7 +20489,7 @@
         errorLine2="                             ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2318"
+            line="2321"
             column="30"/>
     </issue>
 
@@ -20555,7 +20500,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2371"
+            line="2374"
             column="62"/>
     </issue>
 
@@ -20566,7 +20511,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2437"
+            line="2440"
             column="55"/>
     </issue>
 
@@ -20577,7 +20522,7 @@
         errorLine2="                                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2478"
+            line="2481"
             column="45"/>
     </issue>
 
@@ -20588,7 +20533,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2492"
+            line="2495"
             column="52"/>
     </issue>
 
@@ -20599,7 +20544,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2656"
+            line="2680"
             column="49"/>
     </issue>
 
@@ -20610,7 +20555,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2672"
+            line="2696"
             column="37"/>
     </issue>
 
@@ -20621,7 +20566,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2730"
+            line="2754"
             column="19"/>
     </issue>
 
@@ -20632,7 +20577,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2746"
+            line="2770"
             column="66"/>
     </issue>
 
@@ -20643,7 +20588,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2775"
+            line="2799"
             column="19"/>
     </issue>
 
@@ -20654,7 +20599,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2793"
+            line="2817"
             column="66"/>
     </issue>
 
@@ -20665,7 +20610,7 @@
         errorLine2="                                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3441"
+            line="3465"
             column="58"/>
     </issue>
 
@@ -20676,7 +20621,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3559"
+            line="3583"
             column="59"/>
     </issue>
 
@@ -20687,7 +20632,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3607"
+            line="3631"
             column="61"/>
     </issue>
 
@@ -20698,7 +20643,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3608"
+            line="3632"
             column="13"/>
     </issue>
 
@@ -20709,7 +20654,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3608"
+            line="3632"
             column="51"/>
     </issue>
 
@@ -20720,7 +20665,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3628"
+            line="3652"
             column="58"/>
     </issue>
 
@@ -20731,7 +20676,7 @@
         errorLine2="                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3731"
+            line="3755"
             column="19"/>
     </issue>
 
@@ -20742,7 +20687,7 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3731"
+            line="3755"
             column="76"/>
     </issue>
 
@@ -20753,7 +20698,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3929"
+            line="3953"
             column="37"/>
     </issue>
 
@@ -20764,7 +20709,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3929"
+            line="3953"
             column="45"/>
     </issue>
 
@@ -20775,7 +20720,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3965"
+            line="3989"
             column="49"/>
     </issue>
 
@@ -20786,7 +20731,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3984"
+            line="4008"
             column="51"/>
     </issue>
 
@@ -20797,7 +20742,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4031"
+            line="4055"
             column="50"/>
     </issue>
 
@@ -20808,7 +20753,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4031"
+            line="4055"
             column="61"/>
     </issue>
 
@@ -20819,7 +20764,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4057"
+            line="4081"
             column="19"/>
     </issue>
 
@@ -20830,7 +20775,7 @@
         errorLine2="                                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4057"
+            line="4081"
             column="58"/>
     </issue>
 
@@ -20841,7 +20786,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4120"
+            line="4144"
             column="50"/>
     </issue>
 
@@ -20852,7 +20797,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4137"
+            line="4161"
             column="48"/>
     </issue>
 
diff --git a/emoji/bundled/lint-baseline.xml b/emoji/bundled/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/emoji/bundled/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index 9dbfa8e..5ebe9a9 100644
--- a/emoji/core/lint-baseline.xml
+++ b/emoji/core/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiProcessor.java"
-            line="665"
+            line="654"
             column="32"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiProcessor.java"
-            line="713"
+            line="702"
             column="32"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiProcessor.java"
-            line="770"
+            line="759"
             column="32"/>
     </issue>
 
@@ -254,7 +254,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="294"
+            line="302"
             column="19"/>
     </issue>
 
@@ -265,7 +265,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="314"
+            line="322"
             column="19"/>
     </issue>
 
@@ -276,7 +276,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="329"
+            line="337"
             column="19"/>
     </issue>
 
@@ -287,7 +287,7 @@
         errorLine2="                                          ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="329"
+            line="337"
             column="43"/>
     </issue>
 
@@ -298,7 +298,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="355"
+            line="352"
             column="19"/>
     </issue>
 
@@ -309,7 +309,7 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="544"
+            line="541"
             column="19"/>
     </issue>
 
@@ -320,7 +320,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="628"
+            line="625"
             column="12"/>
     </issue>
 
@@ -331,7 +331,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="664"
+            line="661"
             column="12"/>
     </issue>
 
@@ -342,7 +342,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="699"
+            line="696"
             column="12"/>
     </issue>
 
@@ -353,7 +353,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="739"
+            line="736"
             column="12"/>
     </issue>
 
@@ -364,7 +364,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="929"
+            line="979"
             column="16"/>
     </issue>
 
@@ -375,7 +375,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="947"
+            line="997"
             column="16"/>
     </issue>
 
@@ -386,7 +386,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="964"
+            line="1014"
             column="16"/>
     </issue>
 
@@ -397,7 +397,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="984"
+            line="1034"
             column="16"/>
     </issue>
 
@@ -408,7 +408,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="1003"
+            line="1053"
             column="16"/>
     </issue>
 
@@ -419,7 +419,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="1027"
+            line="1077"
             column="16"/>
     </issue>
 
@@ -430,7 +430,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="1038"
+            line="1088"
             column="16"/>
     </issue>
 
@@ -441,7 +441,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="1079"
+            line="1129"
             column="16"/>
     </issue>
 
@@ -452,7 +452,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="1087"
+            line="1150"
             column="25"/>
     </issue>
 
@@ -767,17 +767,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public boolean hasGlyph(final CharSequence charSequence, int start, final int end) {"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/emoji/text/EmojiProcessor.java"
-            line="822"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public int getSize(@NonNull final Paint paint, final CharSequence text, final int start,"
         errorLine2="                                                         ~~~~~~~~~~~~">
         <location
diff --git a/enterprise/feedback/lint-baseline.xml b/enterprise/feedback/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/enterprise/feedback/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/enterprise/feedback/testing/lint-baseline.xml b/enterprise/feedback/testing/lint-baseline.xml
deleted file mode 100644
index f67a956..0000000
--- a/enterprise/feedback/testing/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
-
-</issues>
diff --git a/exifinterface/exifinterface/lint-baseline.xml b/exifinterface/exifinterface/lint-baseline.xml
index 31c94a6..99dbed9 100644
--- a/exifinterface/exifinterface/lint-baseline.xml
+++ b/exifinterface/exifinterface/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="7857"
+            line="7930"
             column="9"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="3951"
+            line="3973"
             column="37"/>
     </issue>
 
@@ -30,29 +30,7 @@
         errorLine2="                   ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4611"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="                Os.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4678"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="                Os.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4700"
+            line="4655"
             column="20"/>
     </issue>
 
@@ -63,30 +41,52 @@
         errorLine2="                       ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4721"
+            line="4725"
             column="24"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="                newFileDescriptor = Os.dup(mSeekableFileDescriptor);"
-        errorLine2="                                       ~~~">
+        errorLine1="                    Os.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);"
+        errorLine2="                       ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4802"
-            column="40"/>
+            line="4752"
+            column="24"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="                Os.lseek(newFileDescriptor, 0, OsConstants.SEEK_SET);"
-        errorLine2="                   ~~~~~">
+        errorLine1="                        Os.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);"
+        errorLine2="                           ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4803"
-            column="20"/>
+            line="4775"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
+        errorLine1="                    newFileDescriptor = Os.dup(mSeekableFileDescriptor);"
+        errorLine2="                                           ~~~">
+        <location
+            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
+            line="4862"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="UnsafeNewApiCall"
+        message="This call is to a method from API 21, the call containing class androidx.exifinterface.media.ExifInterface is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
+        errorLine1="                    Os.lseek(newFileDescriptor, 0, OsConstants.SEEK_SET);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
+            line="4863"
+            column="24"/>
     </issue>
 
     <issue
@@ -96,7 +96,7 @@
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="5753"
+            line="5826"
             column="27"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                   ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="7994"
+            line="8067"
             column="20"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4967"
+            line="5028"
             column="31"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="5012"
+            line="5073"
             column="28"/>
     </issue>
 
diff --git a/fragment/fragment/lint-baseline.xml b/fragment/fragment/lint-baseline.xml
index 13cc14e..8526c0b 100644
--- a/fragment/fragment/lint-baseline.xml
+++ b/fragment/fragment/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/fragment/app/Fragment.java"
-            line="2927"
+            line="2929"
             column="35"/>
     </issue>
 
diff --git a/heifwriter/heifwriter/lint-baseline.xml b/heifwriter/heifwriter/lint-baseline.xml
index fc43d54..b26aa9e 100644
--- a/heifwriter/heifwriter/lint-baseline.xml
+++ b/heifwriter/heifwriter/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="826"
+            line="836"
             column="9"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="841"
+            line="851"
             column="9"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="854"
+            line="864"
             column="9"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="663"
+            line="666"
             column="9"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="693"
+            line="696"
             column="9"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="448"
+            line="444"
             column="34"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="208"
+            line="206"
             column="16"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="223"
+            line="221"
             column="16"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="235"
+            line="233"
             column="16"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="254"
+            line="252"
             column="16"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="269"
+            line="267"
             column="16"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="285"
+            line="283"
             column="16"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="297"
+            line="295"
             column="16"/>
     </issue>
 
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index be6f1ed..6d0b2b5 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -8090,7 +8090,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidanceStylist.java"
-            line="228"
+            line="229"
             column="12"/>
     </issue>
 
@@ -8101,7 +8101,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidanceStylist.java"
-            line="236"
+            line="237"
             column="12"/>
     </issue>
 
@@ -8112,7 +8112,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidanceStylist.java"
-            line="244"
+            line="245"
             column="12"/>
     </issue>
 
@@ -8123,7 +8123,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidanceStylist.java"
-            line="252"
+            line="253"
             column="12"/>
     </issue>
 
diff --git a/lifecycle/lifecycle-extensions/lint-baseline.xml b/lifecycle/lifecycle-extensions/lint-baseline.xml
index d5b1c0f..31eaa5d 100644
--- a/lifecycle/lifecycle-extensions/lint-baseline.xml
+++ b/lifecycle/lifecycle-extensions/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/ViewModelProviders.java"
-            line="34"
+            line="33"
             column="14"/>
     </issue>
 
diff --git a/lifecycle/lifecycle-runtime/lint-baseline.xml b/lifecycle/lifecycle-runtime/lint-baseline.xml
index 9cd5f9b..4da5f56 100644
--- a/lifecycle/lifecycle-runtime/lint-baseline.xml
+++ b/lifecycle/lifecycle-runtime/lint-baseline.xml
@@ -48,12 +48,12 @@
     <issue
         id="RestrictedApi"
         message="FastSafeIterableMap.ceil can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Entry&lt;LifecycleObserver, ObserverWithState> previous = mObserverMap.ceil(observer);"
-        errorLine2="                                                                            ~~~~">
+        errorLine1="        Map.Entry&lt;LifecycleObserver, ObserverWithState> previous = mObserverMap.ceil(observer);"
+        errorLine2="                                                                                ~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
             line="162"
-            column="77"/>
+            column="81"/>
     </issue>
 
     <issue
@@ -158,12 +158,12 @@
     <issue
         id="RestrictedApi"
         message="SafeIterableMap.newest can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            Entry&lt;LifecycleObserver, ObserverWithState> newest = mObserverMap.newest();"
-        errorLine2="                                                                              ~~~~~~">
+        errorLine1="            Map.Entry&lt;LifecycleObserver, ObserverWithState> newest = mObserverMap.newest();"
+        errorLine2="                                                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
             line="304"
-            column="79"/>
+            column="83"/>
     </issue>
 
 </issues>
diff --git a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
index e3f9194..b894031f6 100644
--- a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
@@ -43,6 +43,7 @@
                 TestSizeAnnotationEnforcer.MISSING_TEST_SIZE_ANNOTATION,
                 TestSizeAnnotationEnforcer.UNEXPECTED_TEST_SIZE_ANNOTATION,
                 TestSizeAnnotationEnforcer.UNSUPPORTED_TEST_RUNNER,
+                BanUncheckedReflection.ISSUE,
                 ObsoleteBuildCompatUsageDetector.ISSUE,
                 BanSynchronizedMethods.ISSUE,
                 MetadataTagInsideApplicationTagDetector.ISSUE,
diff --git a/lint-checks/src/main/java/androidx/build/lint/BanUncheckedReflection.kt b/lint-checks/src/main/java/androidx/build/lint/BanUncheckedReflection.kt
new file mode 100644
index 0000000..33c2ea5
--- /dev/null
+++ b/lint-checks/src/main/java/androidx/build/lint/BanUncheckedReflection.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.build.lint
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.checks.VersionChecks.Companion.isWithinVersionCheckConditional
+import com.android.sdklib.SdkVersionInfo
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UCallExpression
+const val METHOD_REFLECTION_CLASS = "java.lang.reflect.Method"
+class BanUncheckedReflection : Detector(), SourceCodeScanner {
+    override fun getApplicableMethodNames() = listOf("invoke")
+    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+        // We are not really monitoring if the reflection call is within the right API check
+        // we leave that to the user, and so we check for any API check really. That means
+        // any check with an upper bound of the highest known API or a with a lower bound of 1
+        // (which should technically include every check) is good enough.
+        // Return if not reflection
+        if (!context.evaluator.isMemberInClass(method, METHOD_REFLECTION_CLASS)) return
+        // If not within an SDK check, flag
+        if (!isWithinVersionCheckConditional(
+                context.evaluator, node, SdkVersionInfo.HIGHEST_KNOWN_API, false
+            ) && !isWithinVersionCheckConditional(
+                    context.evaluator, node, 1, true
+                )
+        ) {
+
+            context.report(
+                ISSUE, node, context.getLocation(node),
+                "Calling Method.invoke without an SDK check"
+            )
+        }
+    }
+    companion object {
+        val ISSUE = Issue.create(
+            "BanUncheckedReflection",
+            "Reflection that is not within an SDK check",
+            "Use of reflection can be risky and there is never a" +
+                " reason to use reflection without" +
+                " having to check for the device's SDK (either through SDK_INT comparison or " +
+                "methods such as isAtLeastP etc...)" +
+                ". Please surround the Method.invoke" +
+                " call with the appropriate SDK_INT check.",
+            Category.CORRECTNESS, 5, Severity.ERROR,
+            Implementation(BanUncheckedReflection::class.java, Scope.JAVA_FILE_SCOPE)
+        )
+    }
+}
diff --git a/media/media/lint-baseline.xml b/media/media/lint-baseline.xml
index 2f932d3..142e1b9 100644
--- a/media/media/lint-baseline.xml
+++ b/media/media/lint-baseline.xml
@@ -239,7 +239,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="294"
+            line="297"
             column="21"/>
     </issue>
 
@@ -569,7 +569,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="602"
+            line="603"
             column="20"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="604"
+            line="605"
             column="20"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2219"
+            line="2220"
             column="24"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2240"
+            line="2241"
             column="50"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2243"
+            line="2244"
             column="36"/>
     </issue>
 
@@ -624,56 +624,12 @@
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="3948"
+            line="3963"
             column="29"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.media.MediaSessionManagerImplApi28.RemoteUserInfoImplApi28 is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            mObject = new android.media.session.MediaSessionManager.RemoteUserInfo("
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media/MediaSessionManagerImplApi28.java"
-            line="68"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.media.MediaSessionManagerImplApi28.RemoteUserInfoImplApi28 is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            super(remoteUserInfo.getPackageName(), remoteUserInfo.getPid(),"
-        errorLine2="                                 ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media/MediaSessionManagerImplApi28.java"
-            line="74"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.media.MediaSessionManagerImplApi28.RemoteUserInfoImplApi28 is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="            super(remoteUserInfo.getPackageName(), remoteUserInfo.getPid(),"
-        errorLine2="                                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/media/MediaSessionManagerImplApi28.java"
-            line="74"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 28, the call containing class androidx.media.MediaSessionManagerImplApi28.RemoteUserInfoImplApi28 is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
-        errorLine1="                    remoteUserInfo.getUid());"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/media/MediaSessionManagerImplApi28.java"
-            line="75"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.media.app.NotificationCompat.MediaStyle is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
         errorLine1="                builder.getBuilder().setStyle("
         errorLine2="                                     ~~~~~~~~">
@@ -1614,7 +1570,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1305"
+            line="1306"
             column="37"/>
     </issue>
 
@@ -1625,7 +1581,7 @@
         errorLine2="           ~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1327"
+            line="1328"
             column="12"/>
     </issue>
 
@@ -1636,7 +1592,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1327"
+            line="1328"
             column="27"/>
     </issue>
 
@@ -1647,7 +1603,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1332"
+            line="1333"
             column="22"/>
     </issue>
 
@@ -1658,7 +1614,7 @@
         errorLine2="                                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1332"
+            line="1333"
             column="41"/>
     </issue>
 
@@ -1669,7 +1625,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1332"
+            line="1333"
             column="61"/>
     </issue>
 
@@ -1680,7 +1636,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1423"
+            line="1424"
             column="29"/>
     </issue>
 
@@ -1691,7 +1647,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1423"
+            line="1424"
             column="40"/>
     </issue>
 
@@ -1702,7 +1658,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1433"
+            line="1434"
             column="31"/>
     </issue>
 
@@ -1713,7 +1669,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1454"
+            line="1455"
             column="28"/>
     </issue>
 
@@ -1724,7 +1680,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1480"
+            line="1481"
             column="49"/>
     </issue>
 
@@ -1735,7 +1691,7 @@
         errorLine2="                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1505"
+            line="1506"
             column="56"/>
     </issue>
 
@@ -1746,7 +1702,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1518"
+            line="1519"
             column="33"/>
     </issue>
 
@@ -1757,7 +1713,7 @@
         errorLine2="                 ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1553"
+            line="1554"
             column="18"/>
     </issue>
 
@@ -1768,7 +1724,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1961"
+            line="1962"
             column="16"/>
     </issue>
 
@@ -1779,7 +1735,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaBrowserServiceCompat.java"
-            line="1968"
+            line="1969"
             column="16"/>
     </issue>
 
@@ -1900,7 +1856,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="276"
+            line="279"
             column="19"/>
     </issue>
 
@@ -1911,7 +1867,7 @@
         errorLine2="                                                                ~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="276"
+            line="279"
             column="65"/>
     </issue>
 
@@ -2967,7 +2923,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="618"
+            line="619"
             column="29"/>
     </issue>
 
@@ -2978,7 +2934,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="634"
+            line="635"
             column="29"/>
     </issue>
 
@@ -2989,7 +2945,7 @@
         errorLine2="                                               ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="634"
+            line="635"
             column="48"/>
     </issue>
 
@@ -3000,7 +2956,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="650"
+            line="651"
             column="36"/>
     </issue>
 
@@ -3011,7 +2967,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="667"
+            line="668"
             column="40"/>
     </issue>
 
@@ -3022,7 +2978,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="709"
+            line="710"
             column="37"/>
     </issue>
 
@@ -3033,7 +2989,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="753"
+            line="754"
             column="34"/>
     </issue>
 
@@ -3044,7 +3000,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="753"
+            line="754"
             column="48"/>
     </issue>
 
@@ -3055,7 +3011,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="783"
+            line="784"
             column="12"/>
     </issue>
 
@@ -3066,7 +3022,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="793"
+            line="794"
             column="12"/>
     </issue>
 
@@ -3077,7 +3033,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="802"
+            line="803"
             column="34"/>
     </issue>
 
@@ -3088,7 +3044,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="814"
+            line="815"
             column="29"/>
     </issue>
 
@@ -3099,7 +3055,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="830"
+            line="831"
             column="26"/>
     </issue>
 
@@ -3110,7 +3066,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="854"
+            line="855"
             column="31"/>
     </issue>
 
@@ -3121,7 +3077,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="923"
+            line="924"
             column="27"/>
     </issue>
 
@@ -3132,7 +3088,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="937"
+            line="938"
             column="12"/>
     </issue>
 
@@ -3143,7 +3099,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="951"
+            line="952"
             column="12"/>
     </issue>
 
@@ -3154,7 +3110,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="987"
+            line="988"
             column="12"/>
     </issue>
 
@@ -3165,7 +3121,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="998"
+            line="999"
             column="43"/>
     </issue>
 
@@ -3176,7 +3132,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1011"
+            line="1012"
             column="46"/>
     </issue>
 
@@ -3187,7 +3143,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1034"
+            line="1035"
             column="19"/>
     </issue>
 
@@ -3198,7 +3154,7 @@
         errorLine2="                                                      ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1034"
+            line="1035"
             column="55"/>
     </issue>
 
@@ -3209,7 +3165,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1034"
+            line="1035"
             column="72"/>
     </issue>
 
@@ -3220,7 +3176,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1167"
+            line="1168"
             column="31"/>
     </issue>
 
@@ -3231,7 +3187,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1167"
+            line="1168"
             column="47"/>
     </issue>
 
@@ -3242,7 +3198,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1167"
+            line="1168"
             column="62"/>
     </issue>
 
@@ -3253,7 +3209,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1181"
+            line="1182"
             column="43"/>
     </issue>
 
@@ -3264,7 +3220,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1274"
+            line="1275"
             column="42"/>
     </issue>
 
@@ -3275,7 +3231,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1274"
+            line="1275"
             column="58"/>
     </issue>
 
@@ -3286,7 +3242,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1284"
+            line="1285"
             column="41"/>
     </issue>
 
@@ -3297,7 +3253,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1284"
+            line="1285"
             column="55"/>
     </issue>
 
@@ -3308,7 +3264,7 @@
         errorLine2="                                     ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1292"
+            line="1293"
             column="38"/>
     </issue>
 
@@ -3319,7 +3275,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1292"
+            line="1293"
             column="47"/>
     </issue>
 
@@ -3330,7 +3286,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1305"
+            line="1306"
             column="39"/>
     </issue>
 
@@ -3341,7 +3297,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1305"
+            line="1306"
             column="55"/>
     </issue>
 
@@ -3352,7 +3308,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1314"
+            line="1315"
             column="38"/>
     </issue>
 
@@ -3363,7 +3319,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1314"
+            line="1315"
             column="52"/>
     </issue>
 
@@ -3374,7 +3330,7 @@
         errorLine2="                                  ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1320"
+            line="1321"
             column="35"/>
     </issue>
 
@@ -3385,7 +3341,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1320"
+            line="1321"
             column="44"/>
     </issue>
 
@@ -3396,7 +3352,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1379"
+            line="1380"
             column="33"/>
     </issue>
 
@@ -3407,7 +3363,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1388"
+            line="1389"
             column="33"/>
     </issue>
 
@@ -3418,7 +3374,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1388"
+            line="1389"
             column="54"/>
     </issue>
 
@@ -3429,7 +3385,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1459"
+            line="1460"
             column="36"/>
     </issue>
 
@@ -3440,7 +3396,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1459"
+            line="1460"
             column="51"/>
     </issue>
 
@@ -3451,7 +3407,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1469"
+            line="1470"
             column="36"/>
     </issue>
 
@@ -3462,7 +3418,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1481"
+            line="1482"
             column="36"/>
     </issue>
 
@@ -3473,7 +3429,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1492"
+            line="1493"
             column="39"/>
     </issue>
 
@@ -3484,7 +3440,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1952"
+            line="1953"
             column="23"/>
     </issue>
 
@@ -3495,7 +3451,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1952"
+            line="1953"
             column="39"/>
     </issue>
 
@@ -3506,7 +3462,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1970"
+            line="1971"
             column="23"/>
     </issue>
 
@@ -3517,7 +3473,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1970"
+            line="1971"
             column="39"/>
     </issue>
 
@@ -3528,7 +3484,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1970"
+            line="1971"
             column="53"/>
     </issue>
 
@@ -3539,7 +3495,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1987"
+            line="1988"
             column="35"/>
     </issue>
 
@@ -3550,7 +3506,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2031"
+            line="2032"
             column="16"/>
     </issue>
 
@@ -3561,7 +3517,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2039"
+            line="2040"
             column="16"/>
     </issue>
 
@@ -3572,7 +3528,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2049"
+            line="2050"
             column="36"/>
     </issue>
 
@@ -3583,7 +3539,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2059"
+            line="2060"
             column="16"/>
     </issue>
 
@@ -3594,7 +3550,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2069"
+            line="2070"
             column="38"/>
     </issue>
 
@@ -3605,7 +3561,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2079"
+            line="2080"
             column="16"/>
     </issue>
 
@@ -3616,7 +3572,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2101"
+            line="2102"
             column="23"/>
     </issue>
 
@@ -3627,7 +3583,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2101"
+            line="2102"
             column="40"/>
     </issue>
 
@@ -3638,7 +3594,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2156"
+            line="2157"
             column="26"/>
     </issue>
 
@@ -3649,7 +3605,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2183"
+            line="2184"
             column="16"/>
     </issue>
 
@@ -3660,7 +3616,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2195"
+            line="2196"
             column="35"/>
     </issue>
 
@@ -3671,7 +3627,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2215"
+            line="2216"
             column="16"/>
     </issue>
 
@@ -3682,7 +3638,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2235"
+            line="2236"
             column="23"/>
     </issue>
 
@@ -3693,7 +3649,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2235"
+            line="2236"
             column="47"/>
     </issue>
 
@@ -3704,7 +3660,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2257"
+            line="2258"
             column="23"/>
     </issue>
 
@@ -3715,7 +3671,7 @@
         errorLine2="                                                        ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2257"
+            line="2258"
             column="57"/>
     </issue>
 
@@ -3726,7 +3682,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/MediaSessionManager.java"
-            line="176"
+            line="184"
             column="17"/>
     </issue>
 
diff --git a/media2/player/lint-baseline.xml b/media2/player/lint-baseline.xml
index 8fe0e51..649f869 100644
--- a/media2/player/lint-baseline.xml
+++ b/media2/player/lint-baseline.xml
@@ -46,6 +46,39 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (FileDescriptor) method.invoke(object, fileDescriptor);"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
+            line="100"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            method.invoke(object, fileDescriptor, position, /* whence= */ SEEK_SET);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
+            line="125"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (FileDescriptor) method.invoke(object, fileDescriptor);"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
+            line="150"
+            column="37"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.media2.player.ExoPlayerWrapper is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
         errorLine1="        PersistableBundle bundle = new PersistableBundle();"
diff --git a/media2/widget/lint-baseline.xml b/media2/widget/lint-baseline.xml
index a844da6..3830510 100644
--- a/media2/widget/lint-baseline.xml
+++ b/media2/widget/lint-baseline.xml
@@ -327,7 +327,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/VideoView.java"
-            line="572"
+            line="571"
             column="12"/>
     </issue>
 
diff --git a/mediarouter/mediarouter/lint-baseline.xml b/mediarouter/mediarouter/lint-baseline.xml
index 4da6344..9223937 100644
--- a/mediarouter/mediarouter/lint-baseline.xml
+++ b/mediarouter/mediarouter/lint-baseline.xml
@@ -1,433 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-dev" client="gradle" variant="debug" version="4.2.0-dev">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.TransferCallback is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            if (newController == mMediaRouter2.getSystemController()) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                        mSelectRouteIntMethod.invoke(router, types, route);"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="366"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.TransferCallback is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                List&lt;MediaRoute2Info> selectedRoutes = newController.getSelectedRoutes();"
-        errorLine2="                                                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="369"
-            column="70"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.TransferCallback is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                String routeId = selectedRoutes.get(0).getId();"
-        errorLine2="                                                       ~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="375"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mRoutingController.setVolume(volume);"
-        errorLine2="                               ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="471"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            int volumeBefore = mOptimisticVolume &lt; 0 ? mRoutingController.getVolume() :"
-        errorLine2="                                                                          ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="481"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    mRoutingController.getVolumeMax()));"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="484"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mRoutingController.setVolume(mOptimisticVolume);"
-        errorLine2="                               ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="485"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            if (mRoutingController == null || mRoutingController.isReleased()"
-        errorLine2="                                                                 ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="491"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mRoutingController.release();"
-        errorLine2="                               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="519"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mMediaRouter2.transferTo(route);"
-        errorLine2="                          ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="537"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mRoutingController.selectRoute(route);"
-        errorLine2="                               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="553"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2Provider.GroupRouteController is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mRoutingController.deselectRoute(route);"
-        errorLine2="                               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"
-            line="569"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder(sessionInfo);"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="678"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    sessionInfo.getName() != null ? sessionInfo.getName().toString() : null);"
-        errorLine2="                                ~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="683"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    sessionInfo.getName() != null ? sessionInfo.getName().toString() : null);"
-        errorLine2="                                                                ~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="683"
-            column="65"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mSessionInfo = builder.setControlHints(controlHints).build();"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="685"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mSessionInfo = builder.setControlHints(controlHints).build();"
-        errorLine2="                                                                 ~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="685"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder(sessionInfo);"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="702"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.setName(groupRoute.getName())"
-        errorLine2="                        ~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="705"
+            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"
+            line="327"
             column="25"/>
     </issue>
 
     <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        .setVolume(groupRoute.getVolume())"
-        errorLine2="                         ~~~~~~~~~">
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    return mGetSystemAudioRouteMethod.invoke(router);"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="706"
-            column="26"/>
+            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"
+            line="371"
+            column="28"/>
     </issue>
 
     <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        .setVolumeMax(groupRoute.getVolumeMax())"
-        errorLine2="                         ~~~~~~~~~~~~">
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mScanWifiDisplaysMethod.invoke(mDisplayManager);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="707"
-            column="26"/>
+            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"
+            line="123"
+            column="21"/>
     </issue>
 
     <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        .setVolumeHandling(groupRoute.getVolumeHandling());"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~">
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    int statusCode = (Integer)mGetStatusCodeMethod.invoke(route);"
+        errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="708"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                Bundle controlHints = sessionInfo.getControlHints();"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="710"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.setControlHints(controlHints);"
-        errorLine2="                        ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="718"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            mSessionInfo = builder.build();"
-        errorLine2="                                   ~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="721"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.clearSelectedRoutes();"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="726"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.clearSelectableRoutes();"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="727"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.clearDeselectableRoutes();"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="728"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                builder.clearTransferableRoutes();"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="729"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        builder.addSelectedRoute(routeId);"
-        errorLine2="                                ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="735"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        builder.addSelectableRoute(routeId);"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="739"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        builder.addDeselectableRoute(routeId);"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="742"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                        builder.addTransferableRoute(routeId);"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="745"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    mSessionInfo = builder.build();"
-        errorLine2="                                           ~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="751"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                notifySessionUpdated(mSessionInfo);"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="763"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                notifySessionReleased(mSessionId);"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="791"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    oldSession.getSelectedRoutes();"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="798"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="                    newSession.getSelectedRoutes();"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="800"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.mediarouter.media.MediaRoute2ProviderServiceAdapter.SessionRecord is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            MediaRoute2ProviderServiceAdapter.this.notifySessionCreated(mRequestId, mSessionInfo);"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java"
-            line="822"
-            column="52"/>
+            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"
+            line="165"
+            column="47"/>
     </issue>
 
     <issue
@@ -1130,7 +745,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="146"
+            line="147"
             column="29"/>
     </issue>
 
@@ -1141,7 +756,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="150"
+            line="151"
             column="29"/>
     </issue>
 
@@ -1152,7 +767,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="150"
+            line="151"
             column="46"/>
     </issue>
 
@@ -1163,7 +778,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="154"
+            line="155"
             column="29"/>
     </issue>
 
@@ -1174,7 +789,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="154"
+            line="155"
             column="46"/>
     </issue>
 
@@ -1185,7 +800,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="232"
+            line="233"
             column="34"/>
     </issue>
 
@@ -1196,7 +811,7 @@
         errorLine2="              ~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="460"
+            line="461"
             column="15"/>
     </issue>
 
@@ -1207,7 +822,7 @@
         errorLine2="                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="492"
+            line="493"
             column="44"/>
     </issue>
 
@@ -1218,7 +833,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="517"
+            line="518"
             column="38"/>
     </issue>
 
@@ -1229,7 +844,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="612"
+            line="613"
             column="27"/>
     </issue>
 
@@ -1240,7 +855,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="93"
+            line="94"
             column="36"/>
     </issue>
 
@@ -1251,7 +866,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="97"
+            line="98"
             column="36"/>
     </issue>
 
@@ -1262,7 +877,7 @@
         errorLine2="                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="173"
+            line="174"
             column="26"/>
     </issue>
 
@@ -1273,7 +888,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="183"
+            line="184"
             column="29"/>
     </issue>
 
@@ -2758,7 +2373,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="299"
+            line="312"
             column="12"/>
     </issue>
 
@@ -2769,7 +2384,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="313"
+            line="321"
             column="12"/>
     </issue>
 
@@ -2780,40 +2395,18 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="337"
+            line="345"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addMemberToDynamicGroup(RouteInfo route) {"
-        errorLine2="                                        ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="475"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void removeMemberFromDynamicGroup(RouteInfo route) {"
-        errorLine2="                                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="485"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void addCallback(MediaRouteSelector selector, Callback callback) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="544"
+            line="562"
             column="29"/>
     </issue>
 
@@ -2824,7 +2417,7 @@
         errorLine2="                                                         ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="544"
+            line="562"
             column="58"/>
     </issue>
 
@@ -2835,7 +2428,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="844"
+            line="863"
             column="33"/>
     </issue>
 
@@ -2846,7 +2439,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="859"
+            line="879"
             column="39"/>
     </issue>
 
@@ -2857,7 +2450,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="866"
+            line="887"
             column="12"/>
     </issue>
 
@@ -2868,7 +2461,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1103"
+            line="1125"
             column="16"/>
     </issue>
 
@@ -2879,7 +2472,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1132"
+            line="1154"
             column="16"/>
     </issue>
 
@@ -2890,7 +2483,7 @@
         errorLine2="               ~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1158"
+            line="1180"
             column="16"/>
     </issue>
 
@@ -2901,7 +2494,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1259"
+            line="1281"
             column="16"/>
     </issue>
 
@@ -2912,7 +2505,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1627"
+            line="1649"
             column="55"/>
     </issue>
 
@@ -2923,7 +2516,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1858"
+            line="1884"
             column="16"/>
     </issue>
 
@@ -2934,7 +2527,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1967"
+            line="1991"
             column="16"/>
     </issue>
 
@@ -2945,7 +2538,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1975"
+            line="1999"
             column="16"/>
     </issue>
 
@@ -2956,7 +2549,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1982"
+            line="2006"
             column="16"/>
     </issue>
 
@@ -2967,7 +2560,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1989"
+            line="2013"
             column="16"/>
     </issue>
 
@@ -2978,7 +2571,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2069"
+            line="2078"
             column="37"/>
     </issue>
 
@@ -2989,7 +2582,7 @@
         errorLine2="                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2069"
+            line="2078"
             column="57"/>
     </issue>
 
@@ -3000,7 +2593,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2122"
+            line="2131"
             column="39"/>
     </issue>
 
@@ -3011,7 +2604,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2122"
+            line="2131"
             column="59"/>
     </issue>
 
@@ -3022,7 +2615,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2141"
+            line="2150"
             column="39"/>
     </issue>
 
@@ -3033,7 +2626,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2141"
+            line="2150"
             column="59"/>
     </issue>
 
@@ -3044,7 +2637,7 @@
         errorLine2="                                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2152"
+            line="2161"
             column="34"/>
     </issue>
 
@@ -3055,7 +2648,7 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2152"
+            line="2161"
             column="54"/>
     </issue>
 
@@ -3066,7 +2659,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2161"
+            line="2170"
             column="36"/>
     </issue>
 
@@ -3077,7 +2670,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2161"
+            line="2170"
             column="56"/>
     </issue>
 
@@ -3088,7 +2681,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2170"
+            line="2179"
             column="36"/>
     </issue>
 
@@ -3099,7 +2692,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2170"
+            line="2179"
             column="56"/>
     </issue>
 
@@ -3110,7 +2703,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2179"
+            line="2188"
             column="42"/>
     </issue>
 
@@ -3121,7 +2714,7 @@
         errorLine2="                                                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2179"
+            line="2188"
             column="62"/>
     </issue>
 
@@ -3132,7 +2725,7 @@
         errorLine2="                                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2194"
+            line="2203"
             column="55"/>
     </issue>
 
@@ -3143,7 +2736,7 @@
         errorLine2="                                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2194"
+            line="2203"
             column="75"/>
     </issue>
 
@@ -3154,7 +2747,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2203"
+            line="2212"
             column="37"/>
     </issue>
 
@@ -3165,7 +2758,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2203"
+            line="2212"
             column="57"/>
     </issue>
 
@@ -3176,7 +2769,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2212"
+            line="2221"
             column="39"/>
     </issue>
 
@@ -3187,7 +2780,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2212"
+            line="2221"
             column="59"/>
     </issue>
 
@@ -3198,7 +2791,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2221"
+            line="2230"
             column="39"/>
     </issue>
 
@@ -3209,7 +2802,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2221"
+            line="2230"
             column="59"/>
     </issue>
 
@@ -3220,7 +2813,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2271"
+            line="2280"
             column="30"/>
     </issue>
 
diff --git a/navigation/integration-tests/testapp/lint-baseline.xml b/navigation/integration-tests/testapp/lint-baseline.xml
index d8f00a3..822c3df 100644
--- a/navigation/integration-tests/testapp/lint-baseline.xml
+++ b/navigation/integration-tests/testapp/lint-baseline.xml
@@ -4,23 +4,23 @@
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.navigation.testapp.AndroidFragment is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                notificationManager.createNotificationChannel(NotificationChannel("
+        errorLine1="                notificationManager.createNotificationChannel("
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"
-            line="64"
+            line="65"
             column="37"/>
     </issue>
 
     <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.navigation.testapp.AndroidFragment is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                notificationManager.createNotificationChannel(NotificationChannel("
-        errorLine2="                                                              ^">
+        errorLine1="                    NotificationChannel("
+        errorLine2="                    ^">
         <location
             file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"
-            line="64"
-            column="63"/>
+            line="66"
+            column="21"/>
     </issue>
 
     <issue
diff --git a/navigation/navigation-common-ktx/lint-baseline.xml b/navigation/navigation-common-ktx/lint-baseline.xml
new file mode 100644
index 0000000..ba26677
--- /dev/null
+++ b/navigation/navigation-common-ktx/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                args = method.invoke(null, arguments) as Args"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/navigation/NavArgsLazy.kt"
+            line="52"
+            column="24"/>
+    </issue>
+
+</issues>
diff --git a/preference/preference/lint-baseline.xml b/preference/preference/lint-baseline.xml
index e335d1f..5cb12c9 100644
--- a/preference/preference/lint-baseline.xml
+++ b/preference/preference/lint-baseline.xml
@@ -2274,7 +2274,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="90"
+            line="92"
             column="26"/>
     </issue>
 
@@ -2285,7 +2285,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="151"
+            line="153"
             column="34"/>
     </issue>
 
@@ -2296,7 +2296,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="189"
+            line="191"
             column="12"/>
     </issue>
 
@@ -2307,7 +2307,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="208"
+            line="210"
             column="43"/>
     </issue>
 
@@ -2318,7 +2318,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="255"
+            line="256"
             column="15"/>
     </issue>
 
@@ -2329,7 +2329,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="255"
+            line="256"
             column="39"/>
     </issue>
 
@@ -2340,7 +2340,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="275"
+            line="276"
             column="37"/>
     </issue>
 
@@ -2351,7 +2351,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="301"
+            line="302"
             column="25"/>
     </issue>
 
@@ -2362,7 +2362,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="306"
+            line="307"
             column="27"/>
     </issue>
 
@@ -2373,7 +2373,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="77"
+            line="79"
             column="26"/>
     </issue>
 
@@ -2384,7 +2384,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="138"
+            line="140"
             column="27"/>
     </issue>
 
@@ -2395,7 +2395,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="172"
+            line="174"
             column="12"/>
     </issue>
 
@@ -2406,7 +2406,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="188"
+            line="190"
             column="43"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="232"
+            line="233"
             column="15"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="232"
+            line="233"
             column="39"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="248"
+            line="249"
             column="37"/>
     </issue>
 
@@ -2450,7 +2450,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="270"
+            line="271"
             column="25"/>
     </issue>
 
@@ -2934,7 +2934,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="453"
+            line="452"
             column="36"/>
     </issue>
 
@@ -2945,7 +2945,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="525"
+            line="524"
             column="18"/>
     </issue>
 
@@ -2956,7 +2956,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="543"
+            line="542"
             column="12"/>
     </issue>
 
@@ -2967,7 +2967,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="543"
+            line="542"
             column="46"/>
     </issue>
 
@@ -2978,7 +2978,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="543"
+            line="542"
             column="71"/>
     </issue>
 
@@ -2989,7 +2989,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="544"
+            line="543"
             column="13"/>
     </issue>
 
@@ -3000,7 +3000,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="570"
+            line="569"
             column="12"/>
     </issue>
 
@@ -3011,7 +3011,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="580"
+            line="579"
             column="15"/>
     </issue>
 
@@ -3022,7 +3022,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="580"
+            line="579"
             column="52"/>
     </issue>
 
@@ -3033,7 +3033,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="592"
+            line="591"
             column="43"/>
     </issue>
 
@@ -3044,7 +3044,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="644"
+            line="643"
             column="12"/>
     </issue>
 
@@ -3055,7 +3055,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="648"
+            line="647"
             column="42"/>
     </issue>
 
@@ -3066,7 +3066,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="652"
+            line="651"
             column="42"/>
     </issue>
 
@@ -3077,7 +3077,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="709"
+            line="708"
             column="43"/>
     </issue>
 
@@ -3088,7 +3088,7 @@
         errorLine2="                                                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="709"
+            line="708"
             column="76"/>
     </issue>
 
@@ -3099,7 +3099,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="725"
+            line="724"
             column="41"/>
     </issue>
 
@@ -3110,7 +3110,7 @@
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="725"
+            line="724"
             column="74"/>
     </issue>
 
@@ -3121,7 +3121,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="739"
+            line="738"
             column="17"/>
     </issue>
 
diff --git a/room/runtime/lint-baseline.xml b/room/runtime/lint-baseline.xml
index 31b6be0..45274d7 100644
--- a/room/runtime/lint-baseline.xml
+++ b/room/runtime/lint-baseline.xml
@@ -85,7 +85,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="528"
+            line="606"
             column="40"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="166"
+            line="170"
             column="13"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="211"
+            line="215"
             column="13"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="261"
+            line="265"
             column="13"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="163"
+            line="167"
             column="13"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="205"
+            line="209"
             column="13"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="253"
+            line="257"
             column="13"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="120"
+            line="121"
             column="32"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="120"
+            line="121"
             column="55"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="132"
+            line="133"
             column="32"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="132"
+            line="133"
             column="55"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="133"
+            line="134"
             column="13"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="                                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="133"
+            line="134"
             column="50"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="322"
+            line="332"
             column="33"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="475"
+            line="485"
             column="45"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="564"
+            line="574"
             column="16"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="564"
+            line="574"
             column="43"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="                                                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="564"
+            line="574"
             column="64"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="584"
+            line="594"
             column="16"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="584"
+            line="594"
             column="43"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="585"
+            line="595"
             column="13"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="693"
+            line="703"
             column="56"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="83"
+            line="84"
             column="24"/>
     </issue>
 
@@ -855,7 +855,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="202"
+            line="260"
             column="65"/>
     </issue>
 
@@ -866,7 +866,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="339"
+            line="412"
             column="12"/>
     </issue>
 
@@ -877,7 +877,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="429"
+            line="507"
             column="16"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="990"
+            line="1069"
             column="62"/>
     </issue>
 
diff --git a/room/testing/lint-baseline.xml b/room/testing/lint-baseline.xml
index 7a7323f..374badb 100644
--- a/room/testing/lint-baseline.xml
+++ b/room/testing/lint-baseline.xml
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="205"
+            line="206"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="205"
+            line="206"
             column="59"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="206"
+            line="207"
             column="44"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="256"
+            line="258"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="283"
+            line="285"
             column="35"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="300"
+            line="302"
             column="35"/>
     </issue>
 
diff --git a/samples/Support4Demos/lint-baseline.xml b/samples/Support4Demos/lint-baseline.xml
index d1faac4..766b625 100644
--- a/samples/Support4Demos/lint-baseline.xml
+++ b/samples/Support4Demos/lint-baseline.xml
@@ -74,7 +74,7 @@
         errorLine2="        ^">
         <location
             file="src/main/AndroidManifest.xml"
-            line="443"
+            line="454"
             column="9"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="        ^">
         <location
             file="src/main/AndroidManifest.xml"
-            line="451"
+            line="462"
             column="9"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="70"
+            line="69"
             column="25"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="71"
+            line="70"
             column="25"/>
     </issue>
 
@@ -2868,7 +2868,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="84"
+            line="83"
             column="25"/>
     </issue>
 
@@ -2879,7 +2879,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="85"
+            line="84"
             column="25"/>
     </issue>
 
diff --git a/samples/Support7Demos/lint-baseline.xml b/samples/Support7Demos/lint-baseline.xml
index 40caf3d..da08f99 100644
--- a/samples/Support7Demos/lint-baseline.xml
+++ b/samples/Support7Demos/lint-baseline.xml
@@ -474,7 +474,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="121"
+            line="120"
             column="19"/>
     </issue>
 
@@ -485,7 +485,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="126"
+            line="125"
             column="19"/>
     </issue>
 
@@ -496,7 +496,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="131"
+            line="130"
             column="19"/>
     </issue>
 
@@ -507,7 +507,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="137"
+            line="136"
             column="19"/>
     </issue>
 
@@ -518,7 +518,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="156"
+            line="155"
             column="19"/>
     </issue>
 
@@ -529,7 +529,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="173"
+            line="172"
             column="19"/>
     </issue>
 
@@ -540,7 +540,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="179"
+            line="178"
             column="19"/>
     </issue>
 
@@ -551,7 +551,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="187"
+            line="186"
             column="19"/>
     </issue>
 
@@ -562,7 +562,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="192"
+            line="191"
             column="19"/>
     </issue>
 
@@ -573,7 +573,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="197"
+            line="196"
             column="19"/>
     </issue>
 
@@ -584,7 +584,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="234"
+            line="233"
             column="19"/>
     </issue>
 
@@ -595,7 +595,7 @@
         errorLine2="                          ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="451"
+            line="450"
             column="27"/>
     </issue>
 
@@ -606,7 +606,7 @@
         errorLine2="                          ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="461"
+            line="460"
             column="27"/>
     </issue>
 
@@ -617,7 +617,7 @@
         errorLine2="                          ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="469"
+            line="468"
             column="27"/>
     </issue>
 
@@ -628,7 +628,7 @@
         errorLine2="                          ~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="477"
+            line="476"
             column="27"/>
     </issue>
 
@@ -738,7 +738,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="215"
+            line="214"
             column="54"/>
     </issue>
 
@@ -3099,7 +3099,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="107"
+            line="106"
             column="13"/>
     </issue>
 
@@ -3110,7 +3110,7 @@
         errorLine2="            ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="109"
+            line="108"
             column="13"/>
     </issue>
 
@@ -3121,7 +3121,7 @@
         errorLine2="                                                                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="140"
+            line="139"
             column="84"/>
     </issue>
 
@@ -3132,7 +3132,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="140"
+            line="139"
             column="13"/>
     </issue>
 
@@ -3143,7 +3143,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="142"
+            line="141"
             column="17"/>
     </issue>
 
@@ -3154,7 +3154,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="144"
+            line="143"
             column="39"/>
     </issue>
 
@@ -3165,7 +3165,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="144"
+            line="143"
             column="13"/>
     </issue>
 
@@ -3176,7 +3176,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="146"
+            line="145"
             column="17"/>
     </issue>
 
@@ -3187,7 +3187,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="148"
+            line="147"
             column="17"/>
     </issue>
 
@@ -3198,7 +3198,7 @@
         errorLine2="            ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="151"
+            line="150"
             column="13"/>
     </issue>
 
@@ -3209,7 +3209,7 @@
         errorLine2="            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="157"
+            line="156"
             column="13"/>
     </issue>
 
@@ -3220,7 +3220,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="159"
+            line="158"
             column="33"/>
     </issue>
 
@@ -3231,7 +3231,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="161"
+            line="160"
             column="50"/>
     </issue>
 
@@ -3242,7 +3242,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="163"
+            line="162"
             column="17"/>
     </issue>
 
@@ -3253,7 +3253,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="166"
+            line="165"
             column="17"/>
     </issue>
 
@@ -3264,7 +3264,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="168"
+            line="167"
             column="13"/>
     </issue>
 
@@ -3275,7 +3275,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="181"
+            line="180"
             column="17"/>
     </issue>
 
@@ -3286,7 +3286,7 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="310"
+            line="309"
             column="17"/>
     </issue>
 
@@ -3297,7 +3297,7 @@
         errorLine2="                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="320"
+            line="319"
             column="17"/>
     </issue>
 
@@ -3308,7 +3308,7 @@
         errorLine2="                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="330"
+            line="329"
             column="17"/>
     </issue>
 
@@ -3319,7 +3319,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="344"
+            line="343"
             column="21"/>
     </issue>
 
@@ -3330,7 +3330,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="345"
+            line="344"
             column="21"/>
     </issue>
 
@@ -3341,7 +3341,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="347"
+            line="346"
             column="21"/>
     </issue>
 
@@ -3352,7 +3352,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="356"
+            line="355"
             column="17"/>
     </issue>
 
@@ -3363,7 +3363,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="364"
+            line="363"
             column="37"/>
     </issue>
 
@@ -3374,7 +3374,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="367"
+            line="366"
             column="21"/>
     </issue>
 
@@ -3385,7 +3385,7 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="374"
+            line="373"
             column="17"/>
     </issue>
 
@@ -3396,6 +3396,17 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
+            line="377"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `updateUi` of class `SampleMediaRouterActivity` requires synthetic accessor"
+        errorLine1="                updateUi();"
+        errorLine2="                ~~~~~~~~">
+        <location
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
             line="378"
             column="17"/>
     </issue>
@@ -3407,18 +3418,7 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="379"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `updateUi` of class `SampleMediaRouterActivity` requires synthetic accessor"
-        errorLine1="                updateUi();"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="405"
+            line="404"
             column="17"/>
     </issue>
 
@@ -3429,7 +3429,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="432"
+            line="431"
             column="17"/>
     </issue>
 
@@ -3440,7 +3440,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="437"
+            line="436"
             column="17"/>
     </issue>
 
@@ -3451,7 +3451,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="528"
+            line="527"
             column="53"/>
     </issue>
 
@@ -3462,7 +3462,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="695"
+            line="694"
             column="25"/>
     </issue>
 
@@ -3473,7 +3473,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="730"
+            line="729"
             column="25"/>
     </issue>
 
@@ -3484,7 +3484,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="798"
+            line="797"
             column="21"/>
     </issue>
 
@@ -6597,7 +6597,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="210"
+            line="209"
             column="29"/>
     </issue>
 
@@ -6608,7 +6608,7 @@
         errorLine2="                                  ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="444"
+            line="443"
             column="35"/>
     </issue>
 
@@ -6619,7 +6619,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="489"
+            line="488"
             column="43"/>
     </issue>
 
@@ -6630,7 +6630,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="494"
+            line="493"
             column="41"/>
     </issue>
 
@@ -6641,7 +6641,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="514"
+            line="513"
             column="40"/>
     </issue>
 
@@ -6652,29 +6652,29 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="623"
+            line="622"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void setCallback(Callback cb) {"
-        errorLine2="                                ~~~~~~~~">
+        errorLine1="        public void setCallback(MediaRouter.Callback cb) {"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="637"
+            line="636"
             column="33"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Callback onCreateCallback() {"
-        errorLine2="               ~~~~~~~~">
+        errorLine1="        public MediaRouter.Callback onCreateCallback() {"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="642"
+            line="641"
             column="16"/>
     </issue>
 
@@ -6685,7 +6685,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="758"
+            line="757"
             column="16"/>
     </issue>
 
@@ -6696,7 +6696,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="770"
+            line="769"
             column="16"/>
     </issue>
 
@@ -6707,7 +6707,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="785"
+            line="784"
             column="41"/>
     </issue>
 
@@ -6718,7 +6718,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="790"
+            line="789"
             column="16"/>
     </issue>
 
@@ -6729,7 +6729,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="791"
+            line="790"
             column="17"/>
     </issue>
 
@@ -6740,7 +6740,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java"
-            line="791"
+            line="790"
             column="34"/>
     </issue>
 
diff --git a/slices/builders/lint-baseline.xml b/slices/builders/lint-baseline.xml
index dc0fa05..d9965fb5 100644
--- a/slices/builders/lint-baseline.xml
+++ b/slices/builders/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="232"
+            line="247"
             column="45"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="295"
+            line="305"
             column="45"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="74"
+            line="76"
             column="33"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="74"
+            line="76"
             column="50"/>
     </issue>
 
@@ -1020,7 +1020,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="51"
+            line="53"
             column="35"/>
     </issue>
 
@@ -1031,7 +1031,7 @@
         errorLine2="                                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="51"
+            line="53"
             column="52"/>
     </issue>
 
@@ -1042,7 +1042,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="55"
+            line="57"
             column="35"/>
     </issue>
 
@@ -1053,7 +1053,7 @@
         errorLine2="                                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="55"
+            line="57"
             column="52"/>
     </issue>
 
@@ -1064,7 +1064,7 @@
         errorLine2="                                                                   ~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="55"
+            line="57"
             column="68"/>
     </issue>
 
@@ -1075,7 +1075,7 @@
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="61"
+            line="63"
             column="31"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="68"
+            line="70"
             column="12"/>
     </issue>
 
@@ -1097,7 +1097,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="78"
+            line="80"
             column="12"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="86"
+            line="88"
             column="12"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="100"
+            line="102"
             column="12"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="108"
+            line="110"
             column="12"/>
     </issue>
 
diff --git a/slices/core/lint-baseline.xml b/slices/core/lint-baseline.xml
index 317b481..a7de315 100644
--- a/slices/core/lint-baseline.xml
+++ b/slices/core/lint-baseline.xml
@@ -46,6 +46,17 @@
     </issue>
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (int) h.getClass().getDeclaredMethod(&quot;getIdentifier&quot;).invoke(h);"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceManagerWrapper.java"
+            line="93"
+            column="26"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 19, the call containing class androidx.slice.compat.CompatPermissionManager.PermissionState is not annotated with @RequiresApi(x) where x is at least 19. Either annotate the containing class with at least @RequiresApi(19) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(19)."
         errorLine1="                if (!Objects.equals(path[i], prefix[i])) {"
@@ -63,7 +74,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="640"
+            line="643"
             column="42"/>
     </issue>
 
@@ -74,7 +85,7 @@
         errorLine2="                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="641"
+            line="644"
             column="18"/>
     </issue>
 
@@ -96,7 +107,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="400"
+            line="402"
             column="35"/>
     </issue>
 
@@ -349,7 +360,7 @@
         errorLine2="                 ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="186"
+            line="188"
             column="18"/>
     </issue>
 
@@ -360,7 +371,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="205"
+            line="207"
             column="12"/>
     </issue>
 
@@ -371,7 +382,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="233"
+            line="235"
             column="12"/>
     </issue>
 
@@ -382,7 +393,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="240"
+            line="242"
             column="12"/>
     </issue>
 
@@ -393,7 +404,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="249"
+            line="251"
             column="12"/>
     </issue>
 
@@ -404,7 +415,7 @@
         errorLine2="                      ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="256"
+            line="258"
             column="23"/>
     </issue>
 
@@ -415,7 +426,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="264"
+            line="266"
             column="23"/>
     </issue>
 
@@ -426,7 +437,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="272"
+            line="274"
             column="39"/>
     </issue>
 
@@ -437,7 +448,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="340"
+            line="342"
             column="16"/>
     </issue>
 
@@ -448,7 +459,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="340"
+            line="342"
             column="32"/>
     </issue>
 
@@ -459,7 +470,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="348"
+            line="350"
             column="16"/>
     </issue>
 
@@ -470,7 +481,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="348"
+            line="350"
             column="44"/>
     </issue>
 
@@ -481,7 +492,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="356"
+            line="358"
             column="16"/>
     </issue>
 
@@ -492,7 +503,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="356"
+            line="358"
             column="44"/>
     </issue>
 
@@ -503,7 +514,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="363"
+            line="365"
             column="16"/>
     </issue>
 
@@ -514,7 +525,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="373"
+            line="375"
             column="16"/>
     </issue>
 
@@ -525,7 +536,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="373"
+            line="375"
             column="58"/>
     </issue>
 
@@ -536,7 +547,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="384"
+            line="386"
             column="16"/>
     </issue>
 
@@ -547,7 +558,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="399"
+            line="401"
             column="16"/>
     </issue>
 
@@ -558,7 +569,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="412"
+            line="414"
             column="16"/>
     </issue>
 
@@ -569,7 +580,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="412"
+            line="414"
             column="32"/>
     </issue>
 
@@ -580,7 +591,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="413"
+            line="415"
             column="28"/>
     </issue>
 
@@ -591,7 +602,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="423"
+            line="425"
             column="16"/>
     </issue>
 
@@ -602,7 +613,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="423"
+            line="425"
             column="32"/>
     </issue>
 
@@ -613,7 +624,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="424"
+            line="426"
             column="28"/>
     </issue>
 
@@ -624,7 +635,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="433"
+            line="435"
             column="16"/>
     </issue>
 
@@ -635,7 +646,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="433"
+            line="435"
             column="32"/>
     </issue>
 
@@ -646,7 +657,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="434"
+            line="436"
             column="28"/>
     </issue>
 
@@ -657,7 +668,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="447"
+            line="449"
             column="16"/>
     </issue>
 
@@ -668,7 +679,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="447"
+            line="449"
             column="32"/>
     </issue>
 
@@ -679,7 +690,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="448"
+            line="450"
             column="28"/>
     </issue>
 
@@ -690,7 +701,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="463"
+            line="465"
             column="16"/>
     </issue>
 
@@ -701,7 +712,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="463"
+            line="465"
             column="45"/>
     </issue>
 
@@ -712,7 +723,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="464"
+            line="466"
             column="28"/>
     </issue>
 
@@ -723,7 +734,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="476"
+            line="478"
             column="16"/>
     </issue>
 
@@ -734,7 +745,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="476"
+            line="478"
             column="45"/>
     </issue>
 
@@ -745,7 +756,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="477"
+            line="479"
             column="28"/>
     </issue>
 
@@ -756,7 +767,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="488"
+            line="490"
             column="16"/>
     </issue>
 
@@ -767,7 +778,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="489"
+            line="491"
             column="28"/>
     </issue>
 
@@ -778,7 +789,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="499"
+            line="502"
             column="16"/>
     </issue>
 
@@ -789,7 +800,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="500"
+            line="503"
             column="28"/>
     </issue>
 
@@ -800,7 +811,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="509"
+            line="512"
             column="16"/>
     </issue>
 
@@ -811,7 +822,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="510"
+            line="513"
             column="28"/>
     </issue>
 
@@ -822,7 +833,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="520"
+            line="523"
             column="16"/>
     </issue>
 
@@ -833,7 +844,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="521"
+            line="524"
             column="28"/>
     </issue>
 
@@ -844,7 +855,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="532"
+            line="535"
             column="16"/>
     </issue>
 
@@ -855,7 +866,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="533"
+            line="536"
             column="28"/>
     </issue>
 
@@ -866,7 +877,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="543"
+            line="546"
             column="16"/>
     </issue>
 
@@ -877,7 +888,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="544"
+            line="547"
             column="28"/>
     </issue>
 
@@ -888,7 +899,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="553"
+            line="556"
             column="16"/>
     </issue>
 
@@ -899,7 +910,7 @@
         errorLine2="                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="553"
+            line="556"
             column="38"/>
     </issue>
 
@@ -910,7 +921,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="561"
+            line="564"
             column="16"/>
     </issue>
 
@@ -921,7 +932,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="579"
+            line="582"
             column="12"/>
     </issue>
 
@@ -932,7 +943,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="579"
+            line="582"
             column="28"/>
     </issue>
 
@@ -943,7 +954,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="604"
+            line="607"
             column="36"/>
     </issue>
 
@@ -954,7 +965,7 @@
         errorLine2="                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="604"
+            line="607"
             column="54"/>
     </issue>
 
@@ -965,7 +976,7 @@
         errorLine2="                                  ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="628"
+            line="631"
             column="35"/>
     </issue>
 
@@ -976,7 +987,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="629"
+            line="632"
             column="13"/>
     </issue>
 
@@ -1009,7 +1020,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/core/SliceActionImpl.java"
-            line="153"
+            line="155"
             column="28"/>
     </issue>
 
@@ -1020,7 +1031,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/core/SliceActionImpl.java"
-            line="202"
+            line="204"
             column="12"/>
     </issue>
 
@@ -1031,7 +1042,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/core/SliceActionImpl.java"
-            line="211"
+            line="213"
             column="12"/>
     </issue>
 
@@ -1042,7 +1053,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/core/SliceActionImpl.java"
-            line="229"
+            line="231"
             column="12"/>
     </issue>
 
diff --git a/slices/test/lint-baseline.xml b/slices/test/lint-baseline.xml
index 9e0b0c7..0159dda 100644
--- a/slices/test/lint-baseline.xml
+++ b/slices/test/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="129"
+            line="143"
             column="19"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="129"
+            line="143"
             column="30"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="129"
+            line="143"
             column="43"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="149"
+            line="163"
             column="12"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="658"
+            line="678"
             column="19"/>
     </issue>
 
diff --git a/slices/view/lint-baseline.xml b/slices/view/lint-baseline.xml
index e0bb13b..bff8fb8 100644
--- a/slices/view/lint-baseline.xml
+++ b/slices/view/lint-baseline.xml
@@ -41,7 +41,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="555"
+            line="559"
             column="41"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="109"
+            line="111"
             column="41"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="104"
+            line="106"
             column="24"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="108"
+            line="110"
             column="24"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="                                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="108"
+            line="110"
             column="41"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="174"
+            line="176"
             column="30"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="175"
+            line="177"
             column="27"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="524"
+            line="528"
             column="25"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                           ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="545"
+            line="549"
             column="28"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="545"
+            line="549"
             column="39"/>
     </issue>
 
@@ -334,7 +334,7 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public List&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
+        errorLine1="    public DisplayedListItems getRowItems(int availableHeight, SliceStyle style,"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
@@ -345,7 +345,7 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public List&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
+        errorLine1="    public DisplayedListItems getRowItems(int availableHeight, SliceStyle style,"
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
@@ -371,7 +371,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="177"
+            line="180"
             column="12"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="250"
+            line="253"
             column="34"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="251"
+            line="254"
             column="34"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="290"
+            line="293"
             column="37"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                                                                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="290"
+            line="293"
             column="67"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="291"
+            line="294"
             column="13"/>
     </issue>
 
@@ -840,11 +840,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RowStyle(Context context, int resId) {"
+        errorLine1="    public RowStyle(Context context, int resId, @NonNull SliceStyle sliceStyle) {"
         errorLine2="                    ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowStyle.java"
-            line="56"
+            line="74"
             column="21"/>
     </issue>
 
@@ -855,7 +855,7 @@
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="136"
+            line="146"
             column="15"/>
     </issue>
 
@@ -866,29 +866,40 @@
         errorLine2="                   ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="185"
+            line="194"
             column="20"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setStyle(SliceStyle styles) {"
+        errorLine1="    public void setStyle(SliceStyle styles, RowStyle rowStyle) {"
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="211"
+            line="220"
             column="26"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void setStyle(SliceStyle styles, RowStyle rowStyle) {"
+        errorLine2="                                            ~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/widget/RowView.java"
+            line="220"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setSliceActions(List&lt;SliceAction> actions) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="317"
+            line="328"
             column="33"/>
     </issue>
 
@@ -899,7 +910,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="411"
+            line="423"
             column="30"/>
     </issue>
 
@@ -910,7 +921,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="412"
+            line="424"
             column="27"/>
     </issue>
 
@@ -921,7 +932,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1002"
+            line="1042"
             column="35"/>
     </issue>
 
@@ -932,7 +943,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1014"
+            line="1054"
             column="25"/>
     </issue>
 
@@ -943,7 +954,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1053"
+            line="1093"
             column="32"/>
     </issue>
 
@@ -954,24 +965,13 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1053"
+            line="1093"
             column="55"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onNothingSelected(AdapterView&lt;?> parent) {"
-        errorLine2="                                  ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1088"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public ShortcutView(Context context) {"
         errorLine2="                        ~~~~~~~">
         <location
@@ -1016,33 +1016,44 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceActionView(Context context, SliceStyle style) {"
+        errorLine1="    public SliceActionView(Context context, SliceStyle style, RowStyle rowStyle) {"
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="83"
+            line="85"
             column="28"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceActionView(Context context, SliceStyle style) {"
+        errorLine1="    public SliceActionView(Context context, SliceStyle style, RowStyle rowStyle) {"
         errorLine2="                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="83"
+            line="85"
             column="45"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public SliceActionView(Context context, SliceStyle style, RowStyle rowStyle) {"
+        errorLine2="                                                              ~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/widget/SliceActionView.java"
+            line="85"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setAction(@NonNull SliceActionImpl action, EventInfo info,"
         errorLine2="                                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="100"
+            line="101"
             column="60"/>
     </issue>
 
@@ -1053,7 +1064,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="101"
+            line="102"
             column="13"/>
     </issue>
 
@@ -1064,24 +1075,13 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="102"
+            line="103"
             column="13"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onClick(View v) {"
-        errorLine2="                        ~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="233"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public SliceAdapter(Context context) {"
         errorLine2="                        ~~~~~~~">
         <location
@@ -1251,7 +1251,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="353"
+            line="356"
             column="29"/>
     </issue>
 
@@ -1262,7 +1262,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="361"
+            line="364"
             column="32"/>
     </issue>
 
@@ -1273,7 +1273,7 @@
         errorLine2="                                       ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="361"
+            line="364"
             column="40"/>
     </issue>
 
@@ -1284,7 +1284,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="43"
+            line="44"
             column="15"/>
     </issue>
 
@@ -1295,7 +1295,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="52"
+            line="53"
             column="15"/>
     </issue>
 
@@ -1306,7 +1306,18 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="53"
+            line="54"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    protected RowStyle mRowStyle;"
+        errorLine2="              ~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/widget/SliceChildView.java"
+            line="55"
             column="15"/>
     </issue>
 
@@ -1317,7 +1328,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="54"
+            line="56"
             column="15"/>
     </issue>
 
@@ -1328,7 +1339,7 @@
         errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="60"
+            line="62"
             column="27"/>
     </issue>
 
@@ -1339,7 +1350,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="60"
+            line="62"
             column="44"/>
     </issue>
 
@@ -1350,7 +1361,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="72"
+            line="74"
             column="33"/>
     </issue>
 
@@ -1361,7 +1372,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="89"
+            line="91"
             column="30"/>
     </issue>
 
@@ -1372,7 +1383,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="90"
+            line="92"
             column="27"/>
     </issue>
 
@@ -1383,7 +1394,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="97"
+            line="99"
             column="33"/>
     </issue>
 
@@ -1394,7 +1405,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="133"
+            line="135"
             column="40"/>
     </issue>
 
@@ -1405,7 +1416,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="140"
+            line="142"
             column="47"/>
     </issue>
 
@@ -1416,7 +1427,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="147"
+            line="149"
             column="34"/>
     </issue>
 
@@ -1427,7 +1438,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="153"
+            line="155"
             column="35"/>
     </issue>
 
@@ -1438,35 +1449,24 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="165"
+            line="167"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setStyle(SliceStyle styles) {"
+        errorLine1="    public void setStyle(SliceStyle styles, @NonNull RowStyle rowStyle) {"
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="172"
+            line="174"
             column="26"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setPolicy(SliceViewPolicy policy) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/SliceChildView.java"
-            line="179"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected SliceItem mSliceItem;"
         errorLine2="              ~~~~~~~~~">
         <location
@@ -1658,7 +1658,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="84"
+            line="92"
             column="23"/>
     </issue>
 
@@ -1669,29 +1669,18 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="84"
+            line="92"
             column="40"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RowStyle getRowStyle() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="250"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public int getRowHeight(RowContent row, SliceViewPolicy policy) {"
         errorLine2="                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="270"
+            line="307"
             column="29"/>
     </issue>
 
@@ -1702,7 +1691,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="270"
+            line="307"
             column="45"/>
     </issue>
 
@@ -1713,7 +1702,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="304"
+            line="345"
             column="30"/>
     </issue>
 
@@ -1724,7 +1713,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="304"
+            line="345"
             column="48"/>
     </issue>
 
@@ -1735,7 +1724,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="332"
+            line="373"
             column="30"/>
     </issue>
 
@@ -1746,7 +1735,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="332"
+            line="373"
             column="48"/>
     </issue>
 
@@ -1757,7 +1746,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="362"
+            line="404"
             column="35"/>
     </issue>
 
@@ -1768,30 +1757,30 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="362"
+            line="404"
             column="65"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ArrayList&lt;SliceContent> getListItemsForNonScrollingList(ListContent list,"
-        errorLine2="                                                                   ~~~~~~~~~~~">
+        errorLine1="    public DisplayedListItems getListItemsForNonScrollingList(ListContent list,"
+        errorLine2="                                                              ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="389"
-            column="68"/>
+            line="431"
+            column="63"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                                                    SliceViewPolicy policy) {"
-        errorLine2="                                                                    ~~~~~~~~~~~~~~~">
+        errorLine1="                                                             SliceViewPolicy policy) {"
+        errorLine2="                                                             ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="391"
-            column="69"/>
+            line="433"
+            column="62"/>
     </issue>
 
     <issue
@@ -2120,7 +2109,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceView.java"
-            line="823"
+            line="845"
             column="19"/>
     </issue>
 
@@ -2131,7 +2120,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceView.java"
-            line="864"
+            line="886"
             column="40"/>
     </issue>
 
@@ -2263,7 +2252,7 @@
         errorLine2="                        ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="53"
+            line="55"
             column="25"/>
     </issue>
 
@@ -2274,7 +2263,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="99"
+            line="101"
             column="39"/>
     </issue>
 
@@ -2285,7 +2274,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="122"
+            line="124"
             column="27"/>
     </issue>
 
@@ -2296,7 +2285,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="129"
+            line="131"
             column="34"/>
     </issue>
 
@@ -2307,7 +2296,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="134"
+            line="136"
             column="35"/>
     </issue>
 
@@ -2318,7 +2307,7 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="139"
+            line="141"
             column="12"/>
     </issue>
 
@@ -2329,7 +2318,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="150"
+            line="152"
             column="40"/>
     </issue>
 
@@ -2340,7 +2329,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="158"
+            line="160"
             column="33"/>
     </issue>
 
@@ -2351,18 +2340,18 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="163"
+            line="165"
             column="33"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setStyle(SliceStyle style) {"
+        errorLine1="    public void setStyle(SliceStyle style, @NonNull RowStyle rowStyle) {"
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="170"
+            line="172"
             column="26"/>
     </issue>
 
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml b/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
index 1aaf9b4..7ee6746 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
+++ b/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="        ~~~~">
         <location
             file="src/androidTest/java/androidx/sqlite/inspection/SqlDelightInvalidationTest.kt"
-            line="72"
+            line="73"
             column="9"/>
     </issue>
 
diff --git a/sqlite/sqlite-inspection/lint-baseline.xml b/sqlite/sqlite-inspection/lint-baseline.xml
new file mode 100644
index 0000000..2c4647a
--- /dev/null
+++ b/sqlite/sqlite-inspection/lint-baseline.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    mRefreshMethod.invoke(instance);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/sqlite/inspection/RoomInvalidationRegistry.java"
+            line="144"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            mNotifyDataChangeMethod.invoke(query);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/sqlite/inspection/SqlDelightInvalidation.java"
+            line="66"
+            column="13"/>
+    </issue>
+
+</issues>
diff --git a/testutils/testutils-runtime/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
index fcfdbe0..4e2f7df 100644
--- a/testutils/testutils-runtime/lint-baseline.xml
+++ b/testutils/testutils-runtime/lint-baseline.xml
@@ -2,13 +2,57 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            durationSetter.invoke(null, 1.0f)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/testutils/AnimationActivityTestRule.kt"
+            line="82"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="    private val originalDurationScale = durationGetter.invoke(null) as Float"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
+            line="101"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="        durationSetter.invoke(null, animationDurationScale)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
+            line="104"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="        durationSetter.invoke(null, originalDurationScale)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
+            line="108"
+            column="9"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 24, the call containing class androidx.testutils.LocaleTestUtils is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
         errorLine1="                newConfig.setLocales(locales.unwrap() as LocaleList)"
         errorLine2="                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/testutils/LocaleTestUtils.kt"
-            line="200"
+            line="202"
             column="27"/>
     </issue>
 
@@ -19,7 +63,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/testutils/LocaleTestUtils.kt"
-            line="202"
+            line="204"
             column="27"/>
     </issue>
 
diff --git a/textclassifier/textclassifier/lint-baseline.xml b/textclassifier/textclassifier/lint-baseline.xml
index 5c54cd1..02540d3 100644
--- a/textclassifier/textclassifier/lint-baseline.xml
+++ b/textclassifier/textclassifier/lint-baseline.xml
@@ -657,7 +657,7 @@
         errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="505"
+            line="499"
             column="22"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="506"
+            line="500"
             column="20"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="508"
+            line="502"
             column="22"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="509"
+            line="503"
             column="23"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="511"
+            line="505"
             column="22"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="512"
+            line="506"
             column="22"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="514"
+            line="508"
             column="22"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="515"
+            line="509"
             column="25"/>
     </issue>
 
@@ -745,7 +745,7 @@
         errorLine2="                                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="813"
+            line="807"
             column="56"/>
     </issue>
 
@@ -756,7 +756,7 @@
         errorLine2="                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="814"
+            line="808"
             column="57"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="                              ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="882"
+            line="876"
             column="31"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                                                   ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="890"
+            line="884"
             column="52"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="                                                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="915"
+            line="909"
             column="53"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="                              ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="957"
+            line="951"
             column="31"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="                              ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="962"
+            line="956"
             column="31"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="                                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="992"
+            line="986"
             column="56"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="                                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="993"
+            line="987"
             column="51"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="997"
+            line="991"
             column="45"/>
     </issue>
 
@@ -855,7 +855,7 @@
         errorLine2="                                                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1006"
+            line="1000"
             column="51"/>
     </issue>
 
@@ -866,7 +866,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1008"
+            line="1002"
             column="56"/>
     </issue>
 
@@ -877,7 +877,7 @@
         errorLine2="                                                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1009"
+            line="1003"
             column="51"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="                                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1016"
+            line="1010"
             column="61"/>
     </issue>
 
@@ -899,7 +899,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1039"
+            line="1033"
             column="49"/>
     </issue>
 
@@ -910,7 +910,7 @@
         errorLine2="                                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1041"
+            line="1035"
             column="60"/>
     </issue>
 
@@ -921,7 +921,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1042"
+            line="1036"
             column="55"/>
     </issue>
 
@@ -932,7 +932,7 @@
         errorLine2="                                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1043"
+            line="1037"
             column="59"/>
     </issue>
 
@@ -943,7 +943,7 @@
         errorLine2="                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1044"
+            line="1038"
             column="54"/>
     </issue>
 
@@ -954,7 +954,7 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1051"
+            line="1045"
             column="54"/>
     </issue>
 
@@ -965,7 +965,7 @@
         errorLine2="                                                                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1051"
+            line="1045"
             column="82"/>
     </issue>
 
@@ -976,7 +976,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1054"
+            line="1048"
             column="59"/>
     </issue>
 
@@ -987,7 +987,7 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1055"
+            line="1049"
             column="54"/>
     </issue>
 
@@ -998,7 +998,7 @@
         errorLine2="                                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1061"
+            line="1055"
             column="65"/>
     </issue>
 
@@ -1009,7 +1009,7 @@
         errorLine2="                                                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1075"
+            line="1069"
             column="80"/>
     </issue>
 
@@ -1020,7 +1020,7 @@
         errorLine2="                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1078"
+            line="1072"
             column="40"/>
     </issue>
 
@@ -1031,7 +1031,7 @@
         errorLine2="                                         ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1079"
+            line="1073"
             column="42"/>
     </issue>
 
@@ -1042,7 +1042,7 @@
         errorLine2="                                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1079"
+            line="1073"
             column="70"/>
     </issue>
 
@@ -1053,7 +1053,7 @@
         errorLine2="                                                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1085"
+            line="1079"
             column="68"/>
     </issue>
 
@@ -1064,7 +1064,7 @@
         errorLine2="                                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1100"
+            line="1094"
             column="56"/>
     </issue>
 
@@ -1075,7 +1075,7 @@
         errorLine2="                                                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1101"
+            line="1095"
             column="58"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="                                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1104"
+            line="1098"
             column="60"/>
     </issue>
 
@@ -1097,7 +1097,7 @@
         errorLine2="                                                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1105"
+            line="1099"
             column="62"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1132"
+            line="1126"
             column="22"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1166"
+            line="1160"
             column="24"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1189"
+            line="1183"
             column="36"/>
     </issue>
 
@@ -1141,7 +1141,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1190"
+            line="1184"
             column="57"/>
     </issue>
 
@@ -1152,7 +1152,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1192"
+            line="1186"
             column="44"/>
     </issue>
 
@@ -1163,7 +1163,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1199"
+            line="1193"
             column="36"/>
     </issue>
 
@@ -1174,7 +1174,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1200"
+            line="1194"
             column="44"/>
     </issue>
 
@@ -1185,7 +1185,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1202"
+            line="1196"
             column="57"/>
     </issue>
 
@@ -1196,7 +1196,7 @@
         errorLine2="                                                                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1212"
+            line="1206"
             column="85"/>
     </issue>
 
@@ -1207,7 +1207,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1238"
+            line="1232"
             column="28"/>
     </issue>
 
@@ -1218,7 +1218,7 @@
         errorLine2="                                                                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1238"
+            line="1232"
             column="73"/>
     </issue>
 
@@ -1229,7 +1229,7 @@
         errorLine2="                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1258"
+            line="1252"
             column="57"/>
     </issue>
 
@@ -1240,7 +1240,7 @@
         errorLine2="                                                                         ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1261"
+            line="1255"
             column="74"/>
     </issue>
 
@@ -1251,7 +1251,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1263"
+            line="1257"
             column="34"/>
     </issue>
 
@@ -1262,7 +1262,7 @@
         errorLine2="                                                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1311"
+            line="1305"
             column="80"/>
     </issue>
 
@@ -1273,7 +1273,7 @@
         errorLine2="                                                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1313"
+            line="1307"
             column="88"/>
     </issue>
 
@@ -1284,7 +1284,7 @@
         errorLine2="                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1342"
+            line="1336"
             column="43"/>
     </issue>
 
@@ -1295,7 +1295,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1368"
+            line="1362"
             column="40"/>
     </issue>
 
@@ -1306,7 +1306,7 @@
         errorLine2="                                                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1368"
+            line="1362"
             column="72"/>
     </issue>
 
@@ -1317,7 +1317,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1369"
+            line="1363"
             column="44"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="                                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1369"
+            line="1363"
             column="73"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                                               ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1384"
+            line="1378"
             column="48"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                                                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1433"
+            line="1427"
             column="75"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                   ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1499"
+            line="1493"
             column="20"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="                               ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1513"
+            line="1507"
             column="32"/>
     </issue>
 
@@ -1383,7 +1383,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1513"
+            line="1507"
             column="49"/>
     </issue>
 
@@ -1394,7 +1394,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1553"
+            line="1547"
             column="17"/>
     </issue>
 
@@ -1405,7 +1405,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1554"
+            line="1548"
             column="17"/>
     </issue>
 
@@ -1416,7 +1416,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1561"
+            line="1555"
             column="56"/>
     </issue>
 
@@ -1427,7 +1427,7 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/FloatingToolbar.java"
-            line="1562"
+            line="1556"
             column="54"/>
     </issue>
 
@@ -1493,7 +1493,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="749"
+            line="745"
             column="63"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="755"
+            line="751"
             column="63"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="773"
+            line="769"
             column="63"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="780"
+            line="776"
             column="59"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="795"
+            line="791"
             column="63"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/SelectionEvent.java"
-            line="803"
+            line="799"
             column="59"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="                                            ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="236"
+            line="227"
             column="45"/>
     </issue>
 
@@ -1570,7 +1570,7 @@
         errorLine2="                                             ~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="239"
+            line="230"
             column="46"/>
     </issue>
 
@@ -1581,7 +1581,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="242"
+            line="233"
             column="52"/>
     </issue>
 
@@ -1592,7 +1592,7 @@
         errorLine2="                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="244"
+            line="235"
             column="48"/>
     </issue>
 
@@ -1603,7 +1603,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="245"
+            line="236"
             column="62"/>
     </issue>
 
@@ -1614,7 +1614,7 @@
         errorLine2="                                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="249"
+            line="240"
             column="61"/>
     </issue>
 
@@ -1625,7 +1625,7 @@
         errorLine2="                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="254"
+            line="245"
             column="36"/>
     </issue>
 
@@ -1636,7 +1636,7 @@
         errorLine2="                                                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="255"
+            line="246"
             column="62"/>
     </issue>
 
@@ -1647,7 +1647,7 @@
         errorLine2="                                           ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="275"
+            line="266"
             column="44"/>
     </issue>
 
@@ -1658,7 +1658,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="276"
+            line="267"
             column="44"/>
     </issue>
 
@@ -1669,7 +1669,7 @@
         errorLine2="                                               ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="279"
+            line="270"
             column="48"/>
     </issue>
 
@@ -1680,7 +1680,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="280"
+            line="271"
             column="49"/>
     </issue>
 
@@ -1691,7 +1691,7 @@
         errorLine2="                                                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="286"
+            line="277"
             column="75"/>
     </issue>
 
@@ -1702,7 +1702,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="306"
+            line="292"
             column="17"/>
     </issue>
 
@@ -1713,7 +1713,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="307"
+            line="293"
             column="26"/>
     </issue>
 
@@ -1724,7 +1724,7 @@
         errorLine2="                    ~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="310"
+            line="296"
             column="21"/>
     </issue>
 
@@ -1735,7 +1735,7 @@
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="316"
+            line="302"
             column="21"/>
     </issue>
 
@@ -1746,7 +1746,7 @@
         errorLine2="                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="322"
+            line="308"
             column="25"/>
     </issue>
 
@@ -1757,7 +1757,7 @@
         errorLine2="                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="328"
+            line="314"
             column="21"/>
     </issue>
 
@@ -1768,7 +1768,7 @@
         errorLine2="                     ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="329"
+            line="315"
             column="22"/>
     </issue>
 
@@ -1779,7 +1779,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="330"
+            line="316"
             column="22"/>
     </issue>
 
@@ -1790,7 +1790,7 @@
         errorLine2="                       ~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="342"
+            line="328"
             column="24"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="531"
+            line="513"
             column="29"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="531"
+            line="513"
             column="48"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="                                                                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="531"
+            line="513"
             column="73"/>
     </issue>
 
@@ -1834,7 +1834,7 @@
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="532"
+            line="514"
             column="81"/>
     </issue>
 
@@ -1845,7 +1845,7 @@
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="533"
+            line="515"
             column="75"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="544"
+            line="522"
             column="20"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="546"
+            line="524"
             column="22"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="547"
+            line="525"
             column="22"/>
     </issue>
 
@@ -1889,7 +1889,7 @@
         errorLine2="                     ~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="548"
+            line="526"
             column="22"/>
     </issue>
 
@@ -2384,7 +2384,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="277"
+            line="278"
             column="22"/>
     </issue>
 
@@ -2395,7 +2395,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="321"
+            line="323"
             column="47"/>
     </issue>
 
@@ -2406,7 +2406,7 @@
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="468"
+            line="471"
             column="28"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="                                                           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="514"
+            line="517"
             column="60"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="543"
+            line="546"
             column="23"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="545"
+            line="548"
             column="23"/>
     </issue>
 
@@ -2450,7 +2450,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="550"
+            line="553"
             column="23"/>
     </issue>
 
@@ -2461,7 +2461,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="552"
+            line="555"
             column="23"/>
     </issue>
 
@@ -2472,7 +2472,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="557"
+            line="560"
             column="23"/>
     </issue>
 
@@ -2483,7 +2483,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="565"
+            line="568"
             column="49"/>
     </issue>
 
@@ -2494,7 +2494,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="566"
+            line="569"
             column="27"/>
     </issue>
 
@@ -2505,7 +2505,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="145"
+            line="140"
             column="49"/>
     </issue>
 
@@ -2516,7 +2516,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="371"
+            line="357"
             column="16"/>
     </issue>
 
@@ -2527,7 +2527,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="385"
+            line="371"
             column="16"/>
     </issue>
 
@@ -2538,7 +2538,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/TextClassification.java"
-            line="680"
+            line="658"
             column="23"/>
     </issue>
 
@@ -2681,7 +2681,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="130"
+            line="131"
             column="22"/>
     </issue>
 
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index c0b677b..53f158c 100644
--- a/transition/transition/lint-baseline.xml
+++ b/transition/transition/lint-baseline.xml
@@ -2,6 +2,61 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                        (View) sAddGhostMethod.invoke(null, view, viewGroup, matrix));"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/GhostViewPlatform.java"
+            line="47"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                sRemoveGhostMethod.invoke(null, view);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/GhostViewPlatform.java"
+            line="61"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                sCancelMethod.invoke(t);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/ViewGroupUtilsApi14.java"
+            line="125"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                    sInvalidateChildInParentFastMethod.invoke(mHostView, left, top, dirty);"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/ViewOverlayApi14.java"
+            line="289"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                sSetFrameMethod.invoke(v, left, top, right, bottom);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/ViewUtilsBase.java"
+            line="145"
+            column="17"/>
+    </issue>
+
+    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
         errorLine1="    private static class ArrayListManager {"
diff --git a/tv-provider/tv-provider/lint-baseline.xml b/tv-provider/tv-provider/lint-baseline.xml
index 10d144f..b17f119 100644
--- a/tv-provider/tv-provider/lint-baseline.xml
+++ b/tv-provider/tv-provider/lint-baseline.xml
@@ -85,7 +85,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="158"
+            line="159"
             column="12"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="166"
+            line="167"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="194"
+            line="195"
             column="12"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="203"
+            line="204"
             column="12"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="257"
+            line="258"
             column="12"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="275"
+            line="276"
             column="12"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="283"
+            line="284"
             column="12"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="291"
+            line="292"
             column="12"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="335"
+            line="336"
             column="12"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="352"
+            line="353"
             column="12"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="362"
+            line="363"
             column="12"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="370"
+            line="371"
             column="12"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="396"
+            line="397"
             column="12"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="414"
+            line="415"
             column="12"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="426"
+            line="427"
             column="12"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="647"
+            line="648"
             column="24"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="659"
+            line="660"
             column="16"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="659"
+            line="660"
             column="40"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="671"
+            line="672"
             column="16"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="671"
+            line="672"
             column="37"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="685"
+            line="686"
             column="16"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="697"
+            line="698"
             column="16"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="709"
+            line="710"
             column="16"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="                              ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="709"
+            line="710"
             column="31"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="721"
+            line="722"
             column="16"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="721"
+            line="722"
             column="28"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="732"
+            line="733"
             column="16"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="759"
+            line="760"
             column="16"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="782"
+            line="783"
             column="16"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="804"
+            line="805"
             column="16"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="816"
+            line="817"
             column="16"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="                            ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="816"
+            line="817"
             column="29"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="841"
+            line="844"
             column="16"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="853"
+            line="856"
             column="16"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="853"
+            line="856"
             column="35"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="865"
+            line="868"
             column="16"/>
     </issue>
 
@@ -481,7 +481,7 @@
         errorLine2="                               ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="865"
+            line="868"
             column="32"/>
     </issue>
 
@@ -492,7 +492,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="880"
+            line="883"
             column="16"/>
     </issue>
 
@@ -503,7 +503,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="880"
+            line="883"
             column="33"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="892"
+            line="895"
             column="16"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="892"
+            line="895"
             column="33"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="904"
+            line="907"
             column="16"/>
     </issue>
 
@@ -547,7 +547,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="916"
+            line="919"
             column="16"/>
     </issue>
 
@@ -558,7 +558,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="942"
+            line="945"
             column="16"/>
     </issue>
 
@@ -569,7 +569,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="954"
+            line="957"
             column="16"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="966"
+            line="969"
             column="16"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="966"
+            line="969"
             column="28"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="980"
+            line="983"
             column="16"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="992"
+            line="995"
             column="16"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="992"
+            line="995"
             column="31"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1007"
+            line="1010"
             column="16"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1007"
+            line="1010"
             column="44"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1019"
+            line="1022"
             column="16"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1019"
+            line="1022"
             column="27"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1032"
+            line="1035"
             column="16"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1044"
+            line="1047"
             column="16"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1056"
+            line="1059"
             column="16"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1056"
+            line="1059"
             column="37"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1068"
+            line="1071"
             column="16"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="113"
+            line="112"
             column="12"/>
     </issue>
 
@@ -1449,19 +1449,19 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="120"
+            line="119"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public @Type String getType() {"
-        errorLine2="                 ~~~~~~">
+        errorLine1="    public @Channels.Type String getType() {"
+        errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="127"
-            column="18"/>
+            line="126"
+            column="27"/>
     </issue>
 
     <issue
@@ -1471,7 +1471,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="134"
+            line="133"
             column="12"/>
     </issue>
 
@@ -1482,7 +1482,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="141"
+            line="140"
             column="12"/>
     </issue>
 
@@ -1493,7 +1493,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="148"
+            line="147"
             column="12"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="155"
+            line="154"
             column="25"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="186"
+            line="185"
             column="12"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="201"
+            line="200"
             column="12"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="209"
+            line="208"
             column="12"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="217"
+            line="216"
             column="12"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="225"
+            line="224"
             column="12"/>
     </issue>
 
@@ -1570,7 +1570,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="233"
+            line="232"
             column="12"/>
     </issue>
 
@@ -1581,7 +1581,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="248"
+            line="247"
             column="12"/>
     </issue>
 
@@ -1592,7 +1592,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="258"
+            line="257"
             column="25"/>
     </issue>
 
@@ -1603,7 +1603,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="265"
+            line="264"
             column="12"/>
     </issue>
 
@@ -1614,7 +1614,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="272"
+            line="271"
             column="12"/>
     </issue>
 
@@ -1625,7 +1625,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="279"
+            line="278"
             column="12"/>
     </issue>
 
@@ -1636,7 +1636,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="286"
+            line="285"
             column="12"/>
     </issue>
 
@@ -1647,7 +1647,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="293"
+            line="292"
             column="12"/>
     </issue>
 
@@ -1658,7 +1658,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="333"
+            line="332"
             column="12"/>
     </issue>
 
@@ -1669,7 +1669,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="374"
+            line="373"
             column="12"/>
     </issue>
 
@@ -1680,7 +1680,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="386"
+            line="385"
             column="12"/>
     </issue>
 
@@ -1691,7 +1691,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="425"
+            line="424"
             column="19"/>
     </issue>
 
@@ -1702,7 +1702,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="425"
+            line="424"
             column="38"/>
     </issue>
 
@@ -1713,7 +1713,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="631"
+            line="630"
             column="24"/>
     </issue>
 
@@ -1724,7 +1724,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="665"
+            line="664"
             column="16"/>
     </issue>
 
@@ -1735,30 +1735,30 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="665"
+            line="664"
             column="35"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Builder setType(@Type String type) {"
+        errorLine1="        public Builder setType(@Channels.Type String type) {"
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="676"
+            line="675"
             column="16"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Builder setType(@Type String type) {"
-        errorLine2="                                     ~~~~~~">
+        errorLine1="        public Builder setType(@Channels.Type String type) {"
+        errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="676"
-            column="38"/>
+            line="675"
+            column="47"/>
     </issue>
 
     <issue
@@ -1768,7 +1768,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="687"
+            line="686"
             column="16"/>
     </issue>
 
@@ -1779,7 +1779,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="687"
+            line="686"
             column="41"/>
     </issue>
 
@@ -1790,7 +1790,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="698"
+            line="697"
             column="16"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="698"
+            line="697"
             column="39"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="709"
+            line="708"
             column="16"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="709"
+            line="708"
             column="39"/>
     </issue>
 
@@ -1834,7 +1834,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="720"
+            line="719"
             column="16"/>
     </issue>
 
@@ -1845,7 +1845,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="720"
+            line="719"
             column="52"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="732"
+            line="731"
             column="16"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="744"
+            line="743"
             column="16"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="755"
+            line="754"
             column="16"/>
     </issue>
 
@@ -1889,7 +1889,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="767"
+            line="766"
             column="16"/>
     </issue>
 
@@ -1900,7 +1900,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="767"
+            line="766"
             column="48"/>
     </issue>
 
@@ -1911,7 +1911,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="779"
+            line="778"
             column="16"/>
     </issue>
 
@@ -1922,7 +1922,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="779"
+            line="778"
             column="48"/>
     </issue>
 
@@ -1933,7 +1933,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="791"
+            line="790"
             column="16"/>
     </issue>
 
@@ -1944,7 +1944,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="791"
+            line="790"
             column="39"/>
     </issue>
 
@@ -1955,7 +1955,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="802"
+            line="801"
             column="16"/>
     </issue>
 
@@ -1966,7 +1966,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="814"
+            line="813"
             column="16"/>
     </issue>
 
@@ -1977,7 +1977,7 @@
         errorLine2="                                         ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="814"
+            line="813"
             column="42"/>
     </issue>
 
@@ -1988,7 +1988,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="827"
+            line="826"
             column="16"/>
     </issue>
 
@@ -1999,7 +1999,7 @@
         errorLine2="                                              ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="827"
+            line="826"
             column="47"/>
     </issue>
 
@@ -2010,7 +2010,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="839"
+            line="838"
             column="16"/>
     </issue>
 
@@ -2021,7 +2021,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="839"
+            line="838"
             column="41"/>
     </issue>
 
@@ -2032,7 +2032,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="852"
+            line="851"
             column="16"/>
     </issue>
 
@@ -2043,7 +2043,7 @@
         errorLine2="                                           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="852"
+            line="851"
             column="44"/>
     </issue>
 
@@ -2054,7 +2054,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="865"
+            line="864"
             column="16"/>
     </issue>
 
@@ -2065,7 +2065,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="865"
+            line="864"
             column="46"/>
     </issue>
 
@@ -2076,7 +2076,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="876"
+            line="875"
             column="16"/>
     </issue>
 
@@ -2087,7 +2087,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="889"
+            line="888"
             column="16"/>
     </issue>
 
@@ -2098,7 +2098,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="889"
+            line="888"
             column="52"/>
     </issue>
 
@@ -2109,7 +2109,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="900"
+            line="899"
             column="16"/>
     </issue>
 
@@ -2120,7 +2120,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="911"
+            line="910"
             column="16"/>
     </issue>
 
@@ -2131,7 +2131,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="922"
+            line="921"
             column="16"/>
     </issue>
 
@@ -2142,7 +2142,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="933"
+            line="932"
             column="16"/>
     </issue>
 
@@ -2153,7 +2153,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="945"
+            line="944"
             column="16"/>
     </issue>
 
@@ -2164,7 +2164,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="945"
+            line="944"
             column="46"/>
     </issue>
 
@@ -2175,7 +2175,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="956"
+            line="955"
             column="16"/>
     </issue>
 
@@ -2186,7 +2186,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="969"
+            line="968"
             column="16"/>
     </issue>
 
@@ -2197,7 +2197,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="982"
+            line="981"
             column="16"/>
     </issue>
 
@@ -2208,7 +2208,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="995"
+            line="994"
             column="16"/>
     </issue>
 
@@ -2219,7 +2219,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1009"
+            line="1008"
             column="16"/>
     </issue>
 
@@ -2230,7 +2230,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1009"
+            line="1008"
             column="44"/>
     </issue>
 
@@ -2241,7 +2241,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1034"
+            line="1033"
             column="16"/>
     </issue>
 
@@ -2252,7 +2252,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1043"
+            line="1042"
             column="16"/>
     </issue>
 
@@ -2307,7 +2307,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="93"
+            line="92"
             column="19"/>
     </issue>
 
@@ -2318,7 +2318,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="93"
+            line="92"
             column="45"/>
     </issue>
 
@@ -2329,7 +2329,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="121"
+            line="120"
             column="12"/>
     </issue>
 
@@ -2340,7 +2340,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="130"
+            line="129"
             column="12"/>
     </issue>
 
@@ -2351,7 +2351,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="137"
+            line="136"
             column="12"/>
     </issue>
 
@@ -2362,7 +2362,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="145"
+            line="144"
             column="12"/>
     </issue>
 
@@ -2373,7 +2373,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="152"
+            line="151"
             column="12"/>
     </issue>
 
@@ -2384,7 +2384,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="160"
+            line="159"
             column="12"/>
     </issue>
 
@@ -2395,7 +2395,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="172"
+            line="171"
             column="12"/>
     </issue>
 
@@ -2406,7 +2406,7 @@
         errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="172"
+            line="171"
             column="27"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="206"
+            line="205"
             column="12"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="213"
+            line="212"
             column="12"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="220"
+            line="219"
             column="12"/>
     </issue>
 
@@ -2450,7 +2450,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="227"
+            line="226"
             column="12"/>
     </issue>
 
@@ -2461,7 +2461,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="234"
+            line="233"
             column="12"/>
     </issue>
 
@@ -2472,7 +2472,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="241"
+            line="240"
             column="12"/>
     </issue>
 
@@ -2483,7 +2483,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="272"
+            line="271"
             column="40"/>
     </issue>
 
@@ -2494,7 +2494,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="297"
+            line="296"
             column="12"/>
     </issue>
 
@@ -2505,7 +2505,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="354"
+            line="353"
             column="24"/>
     </issue>
 
@@ -2516,7 +2516,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="389"
+            line="388"
             column="16"/>
     </issue>
 
@@ -2527,7 +2527,7 @@
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="389"
+            line="388"
             column="39"/>
     </issue>
 
@@ -2538,7 +2538,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="417"
+            line="416"
             column="16"/>
     </issue>
 
@@ -2549,7 +2549,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="417"
+            line="416"
             column="41"/>
     </issue>
 
@@ -2560,7 +2560,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="429"
+            line="428"
             column="16"/>
     </issue>
 
@@ -2571,7 +2571,7 @@
         errorLine2="                                           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="429"
+            line="428"
             column="44"/>
     </issue>
 
@@ -2582,7 +2582,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="448"
+            line="447"
             column="16"/>
     </issue>
 
@@ -2593,7 +2593,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="448"
+            line="447"
             column="46"/>
     </issue>
 
@@ -2604,7 +2604,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="463"
+            line="462"
             column="16"/>
     </issue>
 
@@ -2615,7 +2615,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="463"
+            line="462"
             column="48"/>
     </issue>
 
@@ -2626,7 +2626,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="478"
+            line="477"
             column="16"/>
     </issue>
 
@@ -2637,7 +2637,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="493"
+            line="492"
             column="16"/>
     </issue>
 
@@ -2648,7 +2648,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="508"
+            line="507"
             column="16"/>
     </issue>
 
@@ -2659,7 +2659,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="523"
+            line="522"
             column="16"/>
     </issue>
 
@@ -2670,7 +2670,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="534"
+            line="533"
             column="16"/>
     </issue>
 
@@ -2681,7 +2681,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="546"
+            line="545"
             column="16"/>
     </issue>
 
@@ -2692,7 +2692,7 @@
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="557"
+            line="556"
             column="16"/>
     </issue>
 
@@ -3286,7 +3286,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="1883"
+            line="1890"
             column="62"/>
     </issue>
 
@@ -3297,7 +3297,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2645"
+            line="2652"
             column="27"/>
     </issue>
 
@@ -3308,7 +3308,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2684"
+            line="2691"
             column="34"/>
     </issue>
 
@@ -3319,7 +3319,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2732"
+            line="2739"
             column="47"/>
     </issue>
 
diff --git a/ui/ui-tooling/lint-baseline.xml b/ui/ui-tooling/lint-baseline.xml
index 1154f4d..932b484 100644
--- a/ui/ui-tooling/lint-baseline.xml
+++ b/ui/ui-tooling/lint-baseline.xml
@@ -2,6 +2,17 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="    return invoke(instance, *arguments)"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/ui/tooling/preview/PreviewUtils.kt"
+            line="141"
+            column="12"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.ui.tooling.preview.LayoutlibFontResourceLoader is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
         errorLine1="            is ResourceFont -> context.resources.getFont(font.resId)"
diff --git a/versionedparcelable/versionedparcelable/lint-baseline.xml b/versionedparcelable/versionedparcelable/lint-baseline.xml
index 1b33fef..e72173f 100644
--- a/versionedparcelable/versionedparcelable/lint-baseline.xml
+++ b/versionedparcelable/versionedparcelable/lint-baseline.xml
@@ -2,6 +2,28 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            return (T) m.invoke(null, versionedParcel);"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"
+            line="1567"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            m.invoke(null, val, versionedParcel);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"
+            line="1592"
+            column="13"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 21, the call containing class androidx.versionedparcelable.VersionedParcel is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
         errorLine1="            writeInt(val.getWidth());"
diff --git a/wear/wear-watchface/lint-baseline.xml b/wear/wear-watchface/lint-baseline.xml
index 49b77e50..5a03523 100644
--- a/wear/wear-watchface/lint-baseline.xml
+++ b/wear/wear-watchface/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"
-            line="234"
+            line="200"
             column="1"/>
     </issue>
 
diff --git a/window/window/lint-baseline.xml b/window/window/lint-baseline.xml
index f67d090..44e9dec 100644
--- a/window/window/lint-baseline.xml
+++ b/window/window/lint-baseline.xml
@@ -1,5 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-dev" client="gradle" variant="debug" version="4.2.0-dev">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            bounds = new Rect((Rect) getBoundsMethod.invoke(windowConfig));"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/window/WindowBoundsHelper.java"
+            line="138"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                bounds.set((Rect) getAppBounds.invoke(windowConfig));"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/window/WindowBoundsHelper.java"
+            line="172"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="                bounds.set((Rect) getAppBounds.invoke(windowConfig));"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/window/WindowBoundsHelper.java"
+            line="175"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="BanUncheckedReflection"
+        message="Calling Method.invoke without an SDK check"
+        errorLine1="            getDisplayInfoMethod.invoke(display, displayInfo);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/window/WindowBoundsHelper.java"
+            line="359"
+            column="13"/>
+    </issue>
 
     <issue
         id="UnsafeNewApiCall"
@@ -14,28 +58,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.window.WindowBoundsHelper is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return platformWindowManager.getCurrentWindowMetrics().getBounds();"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="114"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 30, the call containing class androidx.window.WindowBoundsHelper is not annotated with @RequiresApi(x) where x is at least 30. Either annotate the containing class with at least @RequiresApi(30) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(30)."
-        errorLine1="            return platformWindowManager.getCurrentWindowMetrics().getBounds();"
-        errorLine2="                                                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="114"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 24, the call containing class androidx.window.WindowBoundsHelper is not annotated with @RequiresApi(x) where x is at least 24. Either annotate the containing class with at least @RequiresApi(24) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(24)."
         errorLine1="            if (activity.isInMultiWindowMode()) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
diff --git a/work/workmanager/lint-baseline.xml b/work/workmanager/lint-baseline.xml
index 2edbe70..7d8fdfc 100644
--- a/work/workmanager/lint-baseline.xml
+++ b/work/workmanager/lint-baseline.xml
@@ -118,7 +118,7 @@
         errorLine2="                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="252"
+            line="292"
             column="30"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ProcessUtils.java"
-            line="74"
+            line="77"
             column="32"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/foreground/SystemForegroundService.java"
-            line="137"
+            line="124"
             column="21"/>
     </issue>
 
@@ -962,7 +962,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="271"
+            line="311"
             column="31"/>
     </issue>
 
@@ -973,7 +973,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="271"
+            line="311"
             column="48"/>
     </issue>
 
@@ -1545,7 +1545,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/Schedulers.java"
-            line="61"
+            line="62"
             column="13"/>
     </issue>
 
@@ -2172,7 +2172,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/WorkerWrapper.java"
-            line="681"
+            line="683"
             column="16"/>
     </issue>