Merge "Remove usage of @hide in credentials libraries" into androidx-main
diff --git a/credentials/credentials-play-services-auth/lint-baseline.xml b/credentials/credentials-play-services-auth/lint-baseline.xml
index 1a5d2ae..25997f7 100644
--- a/credentials/credentials-play-services-auth/lint-baseline.xml
+++ b/credentials/credentials-play-services-auth/lint-baseline.xml
@@ -1,95 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.1.0-alpha07">
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class BeginSignInControllerUtility {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/BeginSignInControllerUtility.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="open class CredentialProviderBaseController(private val context: Context) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/CredentialProviderBaseController.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderBeginSignInController(private val context: Context) :"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="abstract class CredentialProviderController&lt;T1 : Any, T2 : Any, R2 : Any, R1 : Any,"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderCreatePasswordController(private val context: Context) :"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderCreatePublicKeyCredentialController(private val context: Context) :"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderMetadataHolder : Service() {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/CredentialProviderMetadataHolder.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderPlayServicesImpl(private val context: Context) : CredentialProvider {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="open class HiddenActivity : Activity() {"
-        errorLine2="           ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/HiddenActivity.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class PublicKeyCredentialControllerUtility {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt"/>
-    </issue>
+<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
 
     <issue
         id="UsesNonDefaultVisibleForTesting"
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderMetadataHolder.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderMetadataHolder.kt
index 08d725c..4847ac0 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderMetadataHolder.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderMetadataHolder.kt
@@ -19,13 +19,13 @@
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
+import androidx.annotation.RestrictTo
 
 /**
  * Metadata holder service for the purpose of defining the class that implements
  * the [androidx.credentials.CredentialProvider] interface
- *
- * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class CredentialProviderMetadataHolder : Service() {
     override fun onBind(p0: Intent?): IBinder? {
         TODO("Not yet implemented")
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
index d4dc2c5..263fb78 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
@@ -20,6 +20,7 @@
 import android.content.Context
 import android.os.CancellationSignal
 import android.util.Log
+import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
 import androidx.credentials.ClearCredentialStateRequest
 import androidx.credentials.CreateCredentialRequest
@@ -45,9 +46,8 @@
 /**
  * Entry point of all credential manager requests to the play-services-auth
  * module.
- *
- * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 @Suppress("deprecation")
 class CredentialProviderPlayServicesImpl(private val context: Context) : CredentialProvider {
 
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/HiddenActivity.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/HiddenActivity.kt
index 725d21b..6fd351b7 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/HiddenActivity.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/HiddenActivity.kt
@@ -23,6 +23,7 @@
 import android.os.Bundle
 import android.os.ResultReceiver
 import android.util.Log
+import androidx.annotation.RestrictTo
 import androidx.credentials.exceptions.CreateCredentialInterruptedException
 import androidx.credentials.exceptions.CreateCredentialUnknownException
 import androidx.credentials.exceptions.GetCredentialInterruptedException
@@ -38,8 +39,8 @@
 
 /**
  * An activity used to ensure all required API versions work as intended.
- * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 @Suppress("Deprecation", "ForbiddenSuperClass")
 open class HiddenActivity : Activity() {
 
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/BeginSignInControllerUtility.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/BeginSignInControllerUtility.kt
index fc59657..b0ba84e 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/BeginSignInControllerUtility.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/BeginSignInControllerUtility.kt
@@ -30,11 +30,9 @@
 
 /**
  * A utility class to handle logic for the begin sign in controller.
- *
- * @hide
  */
 @Suppress("deprecation")
-class BeginSignInControllerUtility {
+internal class BeginSignInControllerUtility {
 
     companion object {
 
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt
index cab317b..8f5e6b9 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt
@@ -51,11 +51,9 @@
 
 /**
  * A controller to handle the BeginSignIn flow with play services.
- *
- * @hide
  */
 @Suppress("deprecation")
-class CredentialProviderBeginSignInController(private val context: Context) :
+internal class CredentialProviderBeginSignInController(private val context: Context) :
     CredentialProviderController<
         GetCredentialRequest,
         BeginSignInRequest,
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt
index 9c4d131..8f750c7 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt
@@ -40,11 +40,9 @@
 
 /**
  * A controller to handle the CreatePassword flow with play services.
- *
- * @hide
  */
 @Suppress("deprecation")
-class CredentialProviderCreatePasswordController(private val context: Context) :
+internal class CredentialProviderCreatePasswordController(private val context: Context) :
     CredentialProviderController<
         CreatePasswordRequest,
         SavePasswordRequest,
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
index 110df63..8045667 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
@@ -47,10 +47,9 @@
 /**
  * A controller to handle the CreatePublicKeyCredential flow with play services.
  *
- * @hide
  */
 @Suppress("deprecation")
-class CredentialProviderCreatePublicKeyCredentialController(private val context: Context) :
+internal class CredentialProviderCreatePublicKeyCredentialController(private val context: Context) :
         CredentialProviderController<
             CreatePublicKeyCredentialRequest,
             PublicKeyCredentialCreationOptions,
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
index 75f09f6..dcb28fb 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
@@ -67,10 +67,8 @@
 
 /**
  * A utility class to handle logic for the begin sign in controller.
- *
- * @hide
  */
-class PublicKeyCredentialControllerUtility {
+internal class PublicKeyCredentialControllerUtility {
 
     companion object {
 
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderBaseController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderBaseController.kt
index 03a254c..dfcf223 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderBaseController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderBaseController.kt
@@ -33,9 +33,8 @@
 
 /**
  * Holds all non type specific details shared by the controllers.
- * @hide
  */
-open class CredentialProviderBaseController(private val context: Context) {
+internal open class CredentialProviderBaseController(private val context: Context) {
     companion object {
 
         // Common retryable status codes from the play modules found
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt
index 8a5dac6..51c7424 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt
@@ -42,10 +42,9 @@
  * @param R1 the credential response type converted back to that used by credential manager
  * @param E1 the credential error type to throw
  *
- * @hide
  */
 @Suppress("deprecation")
-abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : Any,
+internal abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : Any,
     E1 : Any>(private val context: Context) : CredentialProviderBaseController(context) {
 
     companion object {
diff --git a/credentials/credentials/lint-baseline.xml b/credentials/credentials/lint-baseline.xml
index f43f80f..7371789 100644
--- a/credentials/credentials/lint-baseline.xml
+++ b/credentials/credentials/lint-baseline.xml
@@ -1,1616 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.1.0-alpha07">
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialInterruptedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialProviderConfigurationException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialUnknownException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/ClearCredentialUnsupportedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialCancellationException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialInterruptedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialNoCreateOptionException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val credentialData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val credentialData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val credentialData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    val displayInfo: DisplayInfo,"
-        errorLine2="        ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    val displayInfo: DisplayInfo,"
-        errorLine2="        ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    val displayInfo: DisplayInfo,"
-        errorLine2="        ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    class DisplayInfo internal /** @hide */ constructor("
-        errorLine2="          ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val credentialTypeIcon: Icon?,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val credentialTypeIcon: Icon?,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val credentialTypeIcon: Icon?,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val defaultProvider: String?,"
-        errorLine2="            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val defaultProvider: String?,"
-        errorLine2="            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        val defaultProvider: String?,"
-        errorLine2="            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun toBundle(): Bundle {"
-        errorLine2="            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        companion object {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="            const val BUNDLE_KEY_REQUEST_DISPLAY_INFO ="
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="            const val BUNDLE_KEY_CREDENTIAL_TYPE_ICON ="
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="            const val BUNDLE_KEY_DEFAULT_PROVIDER ="
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="            fun parseFromCredentialDataBundle(from: Bundle): DisplayInfo? {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="            fun parseFromCredentialDataBundle(from: Bundle): DisplayInfo? {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        const val BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED ="
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom("
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom("
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom(type: String, data: Bundle): CreateCredentialResponse {"
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom(type: String, data: Bundle): CreateCredentialResponse {"
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialUnknownException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialUnsupportedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePasswordRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePasswordResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePublicKeyCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val data: Bundle,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom(type: String, data: Bundle): Credential {"
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom(type: String, data: Bundle): Credential {"
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/Credential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val requestData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val requestData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val requestData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val candidateQueryData: Bundle,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isSystemProviderRequired: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val isAutoSelectAllowed: Boolean,"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        const val BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED ="
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom("
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun createFrom("
-        errorLine2="            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class CredentialProviderFactory {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialProviderFactory.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class FederatedCredential private constructor() : Credential("
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/FederatedCredential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="internal class FrameworkClassParsingException : Exception()"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/internal/FrameworkClassParsingException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="class FrameworkImplHelper {"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun getFinalCreateCredentialData("
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        fun getFinalCreateCredentialData("
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialCancellationException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val type: String,"
-        errorLine2="             ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    open val errorMessage: CharSequence? = null"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialInterruptedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialProviderConfigurationException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialUnknownException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/GetCredentialUnsupportedException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/GetPasswordOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    override val type: String,"
-        errorLine2="                 ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/GetPublicKeyCredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/NoCredentialException.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PasswordCredential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        const val TYPE_PASSWORD_CREDENTIAL: String = &quot;android.credentials.TYPE_PASSWORD_CREDENTIAL&quot;"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PasswordCredential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PublicKeyCredential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="        const val TYPE_PUBLIC_KEY_CREDENTIAL: String ="
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PublicKeyCredential.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt"/>
-    </issue>
-
-    <issue
-        id="BanHideAnnotation"
-        message="@hide is not allowed in Javadoc"
-        errorLine1="    companion object {"
-        errorLine2="              ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="            @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="            @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreateCredentialRequest.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePasswordRequest.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/CredentialOption.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt"/>
-    </issue>
+<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
 
     <issue
         id="UsesNonDefaultVisibleForTesting"
@@ -1621,265 +10,4 @@
             file="src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt"/>
     </issue>
 
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PasswordCredential.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PasswordCredential.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/PublicKeyCredential.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt"/>
-    </issue>
-
-    <issue
-        id="UsesNonDefaultVisibleForTesting"
-        message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt"/>
-    </issue>
-
 </issues>
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialRequest.kt
index 10c6a67..c3e25f2 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialRequest.kt
@@ -21,7 +21,6 @@
 import android.text.TextUtils
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.PublicKeyCredential.Companion.BUNDLE_KEY_SUBTYPE
 import androidx.credentials.internal.FrameworkClassParsingException
 
@@ -33,22 +32,17 @@
  * register a new user credential.
  */
 abstract class CreateCredentialRequest internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val credentialData: Bundle,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val candidateQueryData: Bundle,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val isSystemProviderRequired: Boolean,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val isAutoSelectAllowed: Boolean,
-    /** @hide */
+    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     val displayInfo: DisplayInfo,
     val origin: String?,
 ) {
@@ -69,12 +63,12 @@
      * displayed next to the `userId` during the user consent to help your user better understand
      * the credential being created
      */
-    class DisplayInfo internal /** @hide */ constructor(
+    class DisplayInfo internal constructor(
         val userId: CharSequence,
         val userDisplayName: CharSequence?,
-        /** @hide */
+        @get:RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         val credentialTypeIcon: Icon?,
-        /** @hide */
+        @get:RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         val defaultProvider: String?,
     ) {
 
@@ -101,9 +95,8 @@
             require(userId.isNotEmpty()) { "userId should not be empty" }
         }
 
-        /** @hide */
         @RequiresApi(23)
-        fun toBundle(): Bundle {
+        internal fun toBundle(): Bundle {
             val bundle = Bundle()
             bundle.putCharSequence(BUNDLE_KEY_USER_ID, userId)
             if (!TextUtils.isEmpty(userDisplayName)) {
@@ -118,38 +111,30 @@
             return bundle
         }
 
-        /** @hide */
-        companion object {
-            /** @hide */
+        internal companion object {
+            @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
             const val BUNDLE_KEY_REQUEST_DISPLAY_INFO =
                 "androidx.credentials.BUNDLE_KEY_REQUEST_DISPLAY_INFO"
-
-            @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-            /** @hide */
+            @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
             const val BUNDLE_KEY_USER_ID =
                 "androidx.credentials.BUNDLE_KEY_USER_ID"
 
-            @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-            /** @hide */
-            const val BUNDLE_KEY_USER_DISPLAY_NAME =
+            internal const val BUNDLE_KEY_USER_DISPLAY_NAME =
                 "androidx.credentials.BUNDLE_KEY_USER_DISPLAY_NAME"
-
-            /** @hide */
+            @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
             const val BUNDLE_KEY_CREDENTIAL_TYPE_ICON =
                 "androidx.credentials.BUNDLE_KEY_CREDENTIAL_TYPE_ICON"
 
-            /** @hide */
-            const val BUNDLE_KEY_DEFAULT_PROVIDER =
+            internal const val BUNDLE_KEY_DEFAULT_PROVIDER =
                 "androidx.credentials.BUNDLE_KEY_DEFAULT_PROVIDER"
 
             /**
              * Returns a RequestDisplayInfo from a `credentialData` Bundle, or otherwise `null` if
              * parsing fails.
-             *
-             * @hide
              */
             @JvmStatic
             @RequiresApi(23)
+            @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
             @Suppress("DEPRECATION") // bundle.getParcelable(key)
             fun parseFromCredentialDataBundle(from: Bundle): DisplayInfo? {
                 return try {
@@ -169,9 +154,8 @@
         }
     }
 
-    /** @hide */
-    companion object {
-        /** @hide */
+    internal companion object {
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         const val BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED =
             "androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED"
 
@@ -179,9 +163,8 @@
          * Attempts to parse the raw data into one of [CreatePasswordRequest],
          * [CreatePublicKeyCredentialRequest], and
          * [CreateCustomCredentialRequest]. Otherwise returns null.
-         *
-         * @hide
          */
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         @JvmStatic
         @RequiresApi(23)
         fun createFrom(
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialResponse.kt b/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialResponse.kt
index 92bc244..88f20a3 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialResponse.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreateCredentialResponse.kt
@@ -25,17 +25,14 @@
  * [CreateCredentialRequest].
  */
 abstract class CreateCredentialResponse internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val data: Bundle,
 ) {
-    /** @hide */
-    companion object {
-        /** @hide */
+    internal companion object {
         @JvmStatic
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         fun createFrom(type: String, data: Bundle): CreateCredentialResponse {
             return try {
                 when (type) {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordRequest.kt
index 62b970b..a124749 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordRequest.kt
@@ -18,7 +18,7 @@
 
 import android.os.Bundle
 import androidx.annotation.RequiresApi
-import androidx.annotation.VisibleForTesting
+import androidx.annotation.RestrictTo
 import androidx.credentials.internal.FrameworkClassParsingException
 
 /**
@@ -67,10 +67,10 @@
         require(password.isNotEmpty()) { "password should not be empty" }
     }
 
-    /** @hide */
-    companion object {
-        internal const val BUNDLE_KEY_ID = "androidx.credentials.BUNDLE_KEY_ID"
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal companion object {
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
+        const val BUNDLE_KEY_ID = "androidx.credentials.BUNDLE_KEY_ID"
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         const val BUNDLE_KEY_PASSWORD = "androidx.credentials.BUNDLE_KEY_PASSWORD"
 
         @JvmStatic
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordResponse.kt b/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordResponse.kt
index b862600..f34f0ec 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordResponse.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreatePasswordResponse.kt
@@ -23,8 +23,7 @@
     PasswordCredential.TYPE_PASSWORD_CREDENTIAL,
     Bundle(),
 ) {
-    /** @hide */
-    companion object {
+    internal companion object {
         @Suppress("UNUSED_PARAMETER")
         @JvmStatic
         internal fun createFrom(data: Bundle): CreatePasswordResponse {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialRequest.kt
index 366d9f1..d1d5875 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialRequest.kt
@@ -81,8 +81,7 @@
         require(requestJson.isNotEmpty()) { "requestJson must not be empty" }
     }
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS =
             "androidx.credentials.BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS"
         internal const val BUNDLE_KEY_CLIENT_DATA_HASH =
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt b/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt
index 8c97f79..ee01b33 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CreatePublicKeyCredentialResponse.kt
@@ -17,7 +17,6 @@
 package androidx.credentials
 
 import android.os.Bundle
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.internal.FrameworkClassParsingException
 
 /**
@@ -39,10 +38,8 @@
             "empty" }
     }
 
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        const val BUNDLE_KEY_REGISTRATION_RESPONSE_JSON =
+    internal companion object {
+        internal const val BUNDLE_KEY_REGISTRATION_RESPONSE_JSON =
             "androidx.credentials.BUNDLE_KEY_REGISTRATION_RESPONSE_JSON"
 
         @JvmStatic
diff --git a/credentials/credentials/src/main/java/androidx/credentials/Credential.kt b/credentials/credentials/src/main/java/androidx/credentials/Credential.kt
index 404ec2f..6488093 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/Credential.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/Credential.kt
@@ -24,17 +24,14 @@
  * Base class for a credential with which the user consented to authenticate to the app.
  */
 abstract class Credential internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val data: Bundle,
 ) {
-    /** @hide */
-    companion object {
-        /** @hide */
+    internal companion object {
         @JvmStatic
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         fun createFrom(type: String, data: Bundle): Credential {
             return try {
                 when (type) {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CredentialOption.kt b/credentials/credentials/src/main/java/androidx/credentials/CredentialOption.kt
index 4655ca9..d1fd69b 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CredentialOption.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CredentialOption.kt
@@ -18,7 +18,6 @@
 
 import android.os.Bundle
 import androidx.annotation.RestrictTo
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.internal.FrameworkClassParsingException
 
 /**
@@ -28,19 +27,14 @@
  * the specific credential types and configurations that your app accepts.
  */
 abstract class CredentialOption internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val requestData: Bundle,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val candidateQueryData: Bundle,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val isSystemProviderRequired: Boolean,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val isAutoSelectAllowed: Boolean,
 ) {
@@ -52,15 +46,12 @@
         }
     }
 
-    /** @hide */
-    companion object {
-        /** @hide */
-        @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-        const val BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED =
+    internal companion object {
+        internal const val BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED =
             "androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED"
 
-        /** @hide */
         @JvmStatic
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         fun createFrom(
             type: String,
             requestData: Bundle,
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt b/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
index cb5b9f9..d230818 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
@@ -22,10 +22,8 @@
 
 /**
  * Factory that returns the credential provider to be used by Credential Manager.
- *
- * @hide
  */
-class CredentialProviderFactory {
+internal class CredentialProviderFactory {
     companion object {
         private const val TAG = "CredProviderFactory"
 
diff --git a/credentials/credentials/src/main/java/androidx/credentials/FederatedCredential.kt b/credentials/credentials/src/main/java/androidx/credentials/FederatedCredential.kt
index e5c2bbf..e30588e 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/FederatedCredential.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/FederatedCredential.kt
@@ -23,10 +23,8 @@
  *
  * Note: the FedCM proposal is still under public discussion and its constructor will be exposed
  * after the proposal is final.
- *
- * @hide
  */
-class FederatedCredential private constructor() : Credential(
+internal class FederatedCredential private constructor() : Credential(
     TYPE_FEDERATED_CREDENTIAL,
     Bundle(),
 ) {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/GetPasswordOption.kt b/credentials/credentials/src/main/java/androidx/credentials/GetPasswordOption.kt
index a65188e..39f4f4d 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/GetPasswordOption.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/GetPasswordOption.kt
@@ -33,8 +33,7 @@
     isAutoSelectAllowed = isAutoSelectAllowed,
 ) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         @Suppress("UNUSED_PARAMETER")
         @JvmStatic
         internal fun createFrom(data: Bundle): GetPasswordOption {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/GetPublicKeyCredentialOption.kt b/credentials/credentials/src/main/java/androidx/credentials/GetPublicKeyCredentialOption.kt
index cdd6e76..586cde4 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/GetPublicKeyCredentialOption.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/GetPublicKeyCredentialOption.kt
@@ -50,8 +50,7 @@
         require(requestJson.isNotEmpty()) { "requestJson must not be empty" }
     }
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS =
             "androidx.credentials.BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS"
         internal const val BUNDLE_KEY_CLIENT_DATA_HASH =
diff --git a/credentials/credentials/src/main/java/androidx/credentials/PasswordCredential.kt b/credentials/credentials/src/main/java/androidx/credentials/PasswordCredential.kt
index 6df28d8..3b143ca 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/PasswordCredential.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/PasswordCredential.kt
@@ -17,7 +17,7 @@
 package androidx.credentials
 
 import android.os.Bundle
-import androidx.annotation.VisibleForTesting
+import androidx.annotation.RestrictTo
 import androidx.credentials.internal.FrameworkClassParsingException
 
 /**
@@ -38,17 +38,15 @@
         require(password.isNotEmpty()) { "password should not be empty" }
     }
 
-    /** @hide */
-    companion object {
+    internal companion object {
         // TODO: this type is officially defined in the framework. This definition should be
         // removed when the framework type is available in jetpack.
-        /** @hide */
-        const val TYPE_PASSWORD_CREDENTIAL: String = "android.credentials.TYPE_PASSWORD_CREDENTIAL"
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
+        const val TYPE_PASSWORD_CREDENTIAL: String =
+            "android.credentials.TYPE_PASSWORD_CREDENTIAL"
 
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        const val BUNDLE_KEY_ID = "androidx.credentials.BUNDLE_KEY_ID"
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        const val BUNDLE_KEY_PASSWORD = "androidx.credentials.BUNDLE_KEY_PASSWORD"
+        internal const val BUNDLE_KEY_ID = "androidx.credentials.BUNDLE_KEY_ID"
+        internal const val BUNDLE_KEY_PASSWORD = "androidx.credentials.BUNDLE_KEY_PASSWORD"
 
         @JvmStatic
         internal fun toBundle(id: String, password: String): Bundle {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/PublicKeyCredential.kt b/credentials/credentials/src/main/java/androidx/credentials/PublicKeyCredential.kt
index d0640fe..e90f1d3 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/PublicKeyCredential.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/PublicKeyCredential.kt
@@ -17,7 +17,6 @@
 package androidx.credentials
 
 import android.os.Bundle
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.internal.FrameworkClassParsingException
 
 /**
@@ -41,18 +40,14 @@
             "authentication response JSON must not be empty" }
     }
 
-    /** @hide */
-    companion object {
+    internal companion object {
         /**
          * The type value for public key credential related operations.
-         *
-         * @hide
          */
-        const val TYPE_PUBLIC_KEY_CREDENTIAL: String =
+        internal const val TYPE_PUBLIC_KEY_CREDENTIAL: String =
             "androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL"
         /** The Bundle key value for the public key credential subtype (privileged or regular). */
         internal const val BUNDLE_KEY_SUBTYPE = "androidx.credentials.BUNDLE_KEY_SUBTYPE"
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
         internal const val BUNDLE_KEY_AUTHENTICATION_RESPONSE_JSON =
             "androidx.credentials.BUNDLE_KEY_AUTHENTICATION_RESPONSE_JSON"
 
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt
index 127f6e7..166e8bf 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialException.kt
@@ -28,10 +28,8 @@
  * @see ClearCredentialUnknownException
  */
 abstract class ClearCredentialException @JvmOverloads internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val errorMessage: CharSequence? = null
 ) : Exception(errorMessage?.toString())
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialInterruptedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialInterruptedException.kt
index 924aae4..40225aa9 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialInterruptedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialInterruptedException.kt
@@ -26,8 +26,7 @@
 class ClearCredentialInterruptedException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : ClearCredentialException(TYPE_CLEAR_CREDENTIAL_INTERRUPTED_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CLEAR_CREDENTIAL_INTERRUPTED_EXCEPTION =
             "androidx.credentials.TYPE_CLEAR_CREDENTIAL_INTERRUPTED_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialProviderConfigurationException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialProviderConfigurationException.kt
index 1483d33..a85e8aa 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialProviderConfigurationException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialProviderConfigurationException.kt
@@ -26,8 +26,7 @@
 class ClearCredentialProviderConfigurationException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : ClearCredentialException(TYPE_CLEAR_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CLEAR_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION =
             "androidx.credentials.TYPE_CLEAR_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnknownException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnknownException.kt
index e241f6c..a311e17 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnknownException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnknownException.kt
@@ -24,9 +24,7 @@
 class ClearCredentialUnknownException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : ClearCredentialException(TYPE_CLEAR_CREDENTIAL_UNKNOWN_EXCEPTION, errorMessage) {
-
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CLEAR_CREDENTIAL_UNKNOWN_EXCEPTION =
             "android.credentials.ClearCredentialStateException.TYPE_UNKNOWN"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnsupportedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnsupportedException.kt
index 3524914..1c522ad 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnsupportedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/ClearCredentialUnsupportedException.kt
@@ -27,8 +27,7 @@
 class ClearCredentialUnsupportedException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : ClearCredentialException(TYPE_CLEAR_CREDENTIAL_UNSUPPORTED_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CLEAR_CREDENTIAL_UNSUPPORTED_EXCEPTION =
             "androidx.credentials.TYPE_CLEAR_CREDENTIAL_UNSUPPORTED_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialCancellationException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialCancellationException.kt
index 4cd52f6..5bc8f11 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialCancellationException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialCancellationException.kt
@@ -26,9 +26,7 @@
 class CreateCredentialCancellationException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_CANCELLATION_EXCEPTION, errorMessage) {
-
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CREATE_CREDENTIAL_CANCELLATION_EXCEPTION =
             "android.credentials.CreateCredentialException.TYPE_USER_CANCELED"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt
index 8faeabc..78a6f26 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialException.kt
@@ -29,10 +29,8 @@
  * @see CreateCredentialUnknownException
 */
 abstract class CreateCredentialException @JvmOverloads internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val errorMessage: CharSequence? = null
 ) : Exception(errorMessage?.toString())
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialInterruptedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialInterruptedException.kt
index cd78998..1e1f176 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialInterruptedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialInterruptedException.kt
@@ -26,9 +26,7 @@
 class CreateCredentialInterruptedException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_INTERRUPTED_EXCEPTION, errorMessage) {
-
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CREATE_CREDENTIAL_INTERRUPTED_EXCEPTION =
             "android.credentials.CreateCredentialException.TYPE_INTERRUPTED"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialNoCreateOptionException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialNoCreateOptionException.kt
index de7c996..0382924 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialNoCreateOptionException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialNoCreateOptionException.kt
@@ -25,9 +25,7 @@
 class CreateCredentialNoCreateOptionException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_NO_CREATE_OPTION, errorMessage) {
-
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CREATE_CREDENTIAL_NO_CREATE_OPTION =
             "android.credentials.CreateCredentialException.TYPE_NO_CREATE_OPTIONS"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt
index 7e27323..f371d7e 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialProviderConfigurationException.kt
@@ -16,8 +16,6 @@
 
 package androidx.credentials.exceptions
 
-import androidx.annotation.VisibleForTesting
-
 /**
  * During the create credential flow, this is thrown when configurations are mismatched for the
  * provider, typically indicating the provider dependency is missing in the manifest or some
@@ -29,10 +27,8 @@
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION,
     errorMessage) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        internal val TYPE_CREATE_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION =
+    internal companion object {
+        internal const val TYPE_CREATE_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION =
             "androidx.credentials.TYPE_CREATE_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnknownException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnknownException.kt
index 40b2476..cb16a64 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnknownException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnknownException.kt
@@ -25,8 +25,7 @@
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_UNKNOWN_EXCEPTION, errorMessage) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CREATE_CREDENTIAL_UNKNOWN_EXCEPTION =
             "android.credentials.CreateCredentialException.TYPE_UNKNOWN"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnsupportedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnsupportedException.kt
index 393cb34..df0250c 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnsupportedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/CreateCredentialUnsupportedException.kt
@@ -27,8 +27,7 @@
 class CreateCredentialUnsupportedException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : CreateCredentialException(TYPE_CREATE_CREDENTIAL_UNSUPPORTED_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_CREATE_CREDENTIAL_UNSUPPORTED_EXCEPTION =
             "androidx.credentials.TYPE_CREATE_CREDENTIAL_UNSUPPORTED_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialCancellationException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialCancellationException.kt
index 044dec8..9cf49be 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialCancellationException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialCancellationException.kt
@@ -27,8 +27,7 @@
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_GET_CREDENTIAL_CANCELLATION_EXCEPTION, errorMessage) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_GET_CREDENTIAL_CANCELLATION_EXCEPTION =
             "android.credentials.GetCredentialException.TYPE_USER_CANCELED"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialException.kt
index a126a2e..d6383e9 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialException.kt
@@ -29,10 +29,8 @@
  * @see GetCredentialInterruptedException
  */
 abstract class GetCredentialException @JvmOverloads internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String,
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val errorMessage: CharSequence? = null
 ) : Exception(errorMessage?.toString())
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialInterruptedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialInterruptedException.kt
index 816ca8d..8ed0357 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialInterruptedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialInterruptedException.kt
@@ -27,8 +27,7 @@
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_GET_CREDENTIAL_INTERRUPTED_EXCEPTION, errorMessage) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_GET_CREDENTIAL_INTERRUPTED_EXCEPTION =
             "android.credentials.GetCredentialException.TYPE_INTERRUPTED"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialProviderConfigurationException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialProviderConfigurationException.kt
index 3d3a169..2fceba4 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialProviderConfigurationException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialProviderConfigurationException.kt
@@ -26,8 +26,7 @@
 class GetCredentialProviderConfigurationException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_GET_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_GET_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION =
             "androidx.credentials.TYPE_GET_CREDENTIAL_PROVIDER_CONFIGURATION_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnknownException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnknownException.kt
index b75ad50..fca2aa7 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnknownException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnknownException.kt
@@ -25,8 +25,7 @@
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_GET_CREDENTIAL_UNKNOWN_EXCEPTION, errorMessage) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_GET_CREDENTIAL_UNKNOWN_EXCEPTION =
             "android.credentials.GetCredentialException.TYPE_UNKNOWN"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnsupportedException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnsupportedException.kt
index 2f6e4dc..827050d 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnsupportedException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/GetCredentialUnsupportedException.kt
@@ -27,8 +27,7 @@
 class GetCredentialUnsupportedException @JvmOverloads constructor(
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_GET_CREDENTIAL_UNSUPPORTED_EXCEPTION, errorMessage) {
-    /** @hide */
-    companion object {
+    internal companion object {
         internal const val TYPE_GET_CREDENTIAL_UNSUPPORTED_EXCEPTION =
             "androidx.credentials.TYPE_GET_CREDENTIAL_UNSUPPORTED_EXCEPTION"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/NoCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/NoCredentialException.kt
index e41a684..961dfb2 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/NoCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/NoCredentialException.kt
@@ -29,8 +29,7 @@
     errorMessage: CharSequence? = null
 ) : GetCredentialException(TYPE_FRAMEWORK_TYPE_NO_CREDENTIAL, errorMessage) {
 
-    /** @hide */
-    companion object {
+    internal companion object {
         /** Maintain a copy of the framework type so that we aren't restricted by the API level. */
         internal const val TYPE_FRAMEWORK_TYPE_NO_CREDENTIAL =
             "android.credentials.GetCredentialException.TYPE_NO_CREDENTIAL"
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt
index fe63bf3..07decbe 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/AbortError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -29,10 +28,8 @@
 @Suppress("ExtendsError")
 class AbortError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ABORT_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ABORT_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ABORT_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ABORT_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt
index 2a591c3..974d005 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ConstraintError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class ConstraintError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_CONSTRAINT_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_CONSTRAINT_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_CONSTRAINT_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_CONSTRAINT_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt
index 08e09289..2a85a7f 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataCloneError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class DataCloneError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_CLONE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_CLONE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_CLONE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_CLONE_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt
index 729c9dc..a64dac5 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DataError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -28,10 +27,8 @@
  */
 @Suppress("ExtendsError")
 class DataError : DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DATA_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt
index bc43ef8..e4ed965 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/DomError.kt
@@ -44,7 +44,6 @@
  * This utilization may vary by use case.
  */
 abstract class DomError(
-    /** @hide */
     @get:VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     open val type: String
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt
index 5140a54..064393c 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/EncodingError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class EncodingError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ENCODING_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ENCODING_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ENCODING_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_ENCODING_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt
index f260677..2fe4fa1 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/HierarchyRequestError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class HierarchyRequestError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_HIERARCHY_REQUEST_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_HIERARCHY_REQUEST_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_HIERARCHY_REQUEST_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_HIERARCHY_REQUEST_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt
index aa19bbf..a65a88e 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InUseAttributeError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class InUseAttributeError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_IN_USE_ATTRIBUTE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_IN_USE_ATTRIBUTE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_IN_USE_ATTRIBUTE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_IN_USE_ATTRIBUTE_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt
index 7b2c856..7a84d8c 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidCharacterError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class InvalidCharacterError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_CHARACTER_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_CHARACTER_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_CHARACTER_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_CHARACTER_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt
index 17479a1..52c19ba 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidModificationError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class InvalidModificationError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_MODIFICATION_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_MODIFICATION_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_MODIFICATION_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_MODIFICATION_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt
index 6f7525c..6acd286 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidNodeTypeError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class InvalidNodeTypeError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_NODE_TYPE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_NODE_TYPE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_NODE_TYPE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_NODE_TYPE_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt
index 4cd4aa8..11385b4 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/InvalidStateError.kt
@@ -16,8 +16,8 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
+
 /**
  * During the create public key credential flow, this is thrown when an authenticator response
  * exception contains a invalid_state_err code from the fido spec, indicating the object reached an
@@ -29,10 +29,8 @@
 @Suppress("ExtendsError")
 class InvalidStateError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_STATE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_STATE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_STATE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_INVALID_STATE_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt
index 42a414f..9e35610 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NamespaceError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class NamespaceError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NAMESPACE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NAMESPACE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NAMESPACE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NAMESPACE_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt
index 31e6239..7e94ef7 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NetworkError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -29,10 +28,8 @@
 @Suppress("ExtendsError")
 class NetworkError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NETWORK_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NETWORK_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NETWORK_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NETWORK_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt
index d5bc768..eb505e1 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NoModificationAllowedError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class NoModificationAllowedError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NO_MODIFICATION_ALLOWED_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NO_MODIFICATION_ALLOWED_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NO_MODIFICATION_ALLOWED_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NO_MODIFICATION_ALLOWED_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt
index 443bd2d..c5474e7c 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotAllowedError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -31,10 +30,8 @@
 @Suppress("ExtendsError")
 class NotAllowedError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_ALLOWED_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_ALLOWED_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_ALLOWED_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_ALLOWED_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt
index eb07222..16bf573 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotFoundError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class NotFoundError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_FOUND_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_FOUND_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_FOUND_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_FOUND_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt
index a414169..49be851 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotReadableError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class NotReadableError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_READABLE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_READABLE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_READABLE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_READABLE_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt
index dfe8dbd..ebb99fb 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/NotSupportedError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class NotSupportedError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_SUPPORTED_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_SUPPORTED_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_SUPPORTED_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_NOT_SUPPORTED_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt
index 45e6446..1dbb790 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OperationError.kt
@@ -16,8 +16,8 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
+
 /**
  * During the create public key credential flow, this is thrown when an authenticator response
  * exception contains and operation_err from the fido spec, indicating the operation failed for an
@@ -29,10 +29,8 @@
 @Suppress("ExtendsError")
 class OperationError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPERATION_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPERATION_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPERATION_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPERATION_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt
index 8005407..6930e15 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/OptOutError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class OptOutError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPT_OUT_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPT_OUT_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPT_OUT_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_OPT_OUT_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt
index fe022b3a..64e26c5 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/QuotaExceededError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class QuotaExceededError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_QUOTA_EXCEEDED_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_QUOTA_EXCEEDED_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_QUOTA_EXCEEDED_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_QUOTA_EXCEEDED_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt
index 9d621aa..48a257d 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/ReadOnlyError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class ReadOnlyError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_READ_ONLY_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_READ_ONLY_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_READ_ONLY_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_READ_ONLY_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt
index fc747c8..2243f52b 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SecurityError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class SecurityError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SECURITY_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SECURITY_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SECURITY_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SECURITY_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt
index a0d9092..5f57a88 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/SyntaxError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class SyntaxError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SYNTAX_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SYNTAX_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SYNTAX_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_SYNTAX_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt
index 06b7740..0de2480 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TimeoutError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -29,10 +28,8 @@
 @Suppress("ExtendsError")
 class TimeoutError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TIMEOUT_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TIMEOUT_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TIMEOUT_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TIMEOUT_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt
index 3685b29..2cfa180 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/TransactionInactiveError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class TransactionInactiveError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TRANSACTION_INACTIVE_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TRANSACTION_INACTIVE_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TRANSACTION_INACTIVE_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_TRANSACTION_INACTIVE_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt
index da446e9..3e99a8f 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/UnknownError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class UnknownError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_UNKNOWN_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_UNKNOWN_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_UNKNOWN_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_UNKNOWN_ERROR"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt
index a14731d..b160edb 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/VersionError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class VersionError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_VERSION_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_VERSION_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_VERSION_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_VERSION_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt
index 3a91da9..6a54a25 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/domerrors/WrongDocumentError.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.domerrors
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException
 
 /**
@@ -30,10 +29,8 @@
 @Suppress("ExtendsError")
 class WrongDocumentError :
     DomError(TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_WRONG_DOCUMENT_ERROR) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_WRONG_DOCUMENT_ERROR: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_WRONG_DOCUMENT_ERROR: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_WRONG_DOCUMENT_ERROR"
     }
 }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt
index 3a5a0f1c..c71d09c 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialDomException.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.publickeycredential
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.domerrors.DomError
 
 /**
@@ -35,10 +34,8 @@
 ) : CreatePublicKeyCredentialException(
     TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION + domError.type,
     errorMessage) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION: String =
+    internal companion object {
+        internal const val TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION: String =
             "androidx.credentials.TYPE_CREATE_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt
index bfcc858..9647903 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/CreatePublicKeyCredentialException.kt
@@ -29,7 +29,6 @@
  * @throws IllegalArgumentException if [type] is empty
  */
 open class CreatePublicKeyCredentialException @JvmOverloads internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override val type: String,
     errorMessage: CharSequence? = null
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt
index 08eb797..ba91548 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialDomException.kt
@@ -16,7 +16,6 @@
 
 package androidx.credentials.exceptions.publickeycredential
 
-import androidx.annotation.VisibleForTesting
 import androidx.credentials.exceptions.domerrors.DomError
 
 /**
@@ -35,10 +34,8 @@
 ) : GetPublicKeyCredentialException(
     TYPE_GET_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION + domError.type,
     errorMessage) {
-    /** @hide */
-    companion object {
-        @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-        const val TYPE_GET_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION: String =
+    internal companion object {
+        internal const val TYPE_GET_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION: String =
             "androidx.credentials.TYPE_GET_PUBLIC_KEY_CREDENTIAL_DOM_EXCEPTION"
     }
 }
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt
index ca1eb692..d5b999f 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/exceptions/publickeycredential/GetPublicKeyCredentialException.kt
@@ -29,7 +29,6 @@
  * @throws IllegalArgumentException if [type] is empty
  */
 open class GetPublicKeyCredentialException @JvmOverloads internal constructor(
-    /** @hide */
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override val type: String,
     errorMessage: CharSequence? = null
diff --git a/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkClassParsingException.kt b/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkClassParsingException.kt
index 8e890c3b..4110de5 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkClassParsingException.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkClassParsingException.kt
@@ -19,7 +19,5 @@
 /**
  * Internal exception used to indicate a parsing error while converting from a framework type to
  * a jetpack type.
- *
- * @hide
  */
 internal class FrameworkClassParsingException : Exception()
\ No newline at end of file
diff --git a/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt b/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt
index ab39cd4..d3bdf01 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/internal/FrameworkImplHelper.kt
@@ -20,20 +20,19 @@
 import android.graphics.drawable.Icon
 import android.os.Bundle
 import androidx.annotation.RequiresApi
+import androidx.annotation.RestrictTo
 import androidx.credentials.CreateCredentialRequest
 import androidx.credentials.CreatePasswordRequest
 import androidx.credentials.CreatePublicKeyCredentialRequest
 import androidx.credentials.R
 
-/** @hide */
 @RequiresApi(23)
-class FrameworkImplHelper {
+internal class FrameworkImplHelper {
     companion object {
         /**
          * Take the create request's `credentialData` and add SDK specific values to it.
-         *
-         * @hide
          */
+        @RestrictTo(RestrictTo.Scope.LIBRARY) // used from java tests
         @JvmStatic
         @RequiresApi(23)
         fun getFinalCreateCredentialData(