diff options
6 files changed, 29 insertions, 28 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index cfa8f47755d9..60bfb9751338 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -13316,7 +13316,7 @@ package android.credentials { method @NonNull public android.os.Bundle getCandidateQueryData(); method @NonNull public android.os.Bundle getCredentialData(); method @NonNull public String getType(); - method public boolean requireSystemProvider(); + method public boolean isSystemProviderRequired(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.credentials.CreateCredentialRequest> CREATOR; } @@ -13363,7 +13363,7 @@ package android.credentials { method @NonNull public android.os.Bundle getCandidateQueryData(); method @NonNull public android.os.Bundle getCredentialRetrievalData(); method @NonNull public String getType(); - method public boolean requireSystemProvider(); + method public boolean isSystemProviderRequired(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.credentials.GetCredentialOption> CREATOR; } diff --git a/core/java/android/credentials/CreateCredentialRequest.java b/core/java/android/credentials/CreateCredentialRequest.java index be887a513e3f..26f8831003cd 100644 --- a/core/java/android/credentials/CreateCredentialRequest.java +++ b/core/java/android/credentials/CreateCredentialRequest.java @@ -54,7 +54,7 @@ public final class CreateCredentialRequest implements Parcelable { /** * Determines whether the request must only be fulfilled by a system provider. */ - private final boolean mRequireSystemProvider; + private final boolean mIsSystemProviderRequired; /** * Returns the requested credential type. @@ -99,8 +99,8 @@ public final class CreateCredentialRequest implements Parcelable { * Returns true if the request must only be fulfilled by a system provider, and false * otherwise. */ - public boolean requireSystemProvider() { - return mRequireSystemProvider; + public boolean isSystemProviderRequired() { + return mIsSystemProviderRequired; } @Override @@ -108,7 +108,7 @@ public final class CreateCredentialRequest implements Parcelable { dest.writeString8(mType); dest.writeBundle(mCredentialData); dest.writeBundle(mCandidateQueryData); - dest.writeBoolean(mRequireSystemProvider); + dest.writeBoolean(mIsSystemProviderRequired); } @Override @@ -122,7 +122,7 @@ public final class CreateCredentialRequest implements Parcelable { + "type=" + mType + ", credentialData=" + mCredentialData + ", candidateQueryData=" + mCandidateQueryData - + ", requireSystemProvider=" + mRequireSystemProvider + + ", isSystemProviderRequired=" + mIsSystemProviderRequired + "}"; } @@ -133,7 +133,8 @@ public final class CreateCredentialRequest implements Parcelable { * @param credentialData the full credential creation request data * @param candidateQueryData the partial request data that will be sent to the provider * during the initial creation candidate query stage - * @param requireSystemProvider whether the request must only be fulfilled by a system provider + * @param isSystemProviderRequired whether the request must only be fulfilled by a system + * provider * * @throws IllegalArgumentException If type is empty. */ @@ -141,19 +142,19 @@ public final class CreateCredentialRequest implements Parcelable { @NonNull String type, @NonNull Bundle credentialData, @NonNull Bundle candidateQueryData, - boolean requireSystemProvider) { + boolean isSystemProviderRequired) { mType = Preconditions.checkStringNotEmpty(type, "type must not be empty"); mCredentialData = requireNonNull(credentialData, "credentialData must not be null"); mCandidateQueryData = requireNonNull(candidateQueryData, "candidateQueryData must not be null"); - mRequireSystemProvider = requireSystemProvider; + mIsSystemProviderRequired = isSystemProviderRequired; } private CreateCredentialRequest(@NonNull Parcel in) { String type = in.readString8(); Bundle credentialData = in.readBundle(); Bundle candidateQueryData = in.readBundle(); - boolean requireSystemProvider = in.readBoolean(); + boolean isSystemProviderRequired = in.readBoolean(); mType = type; AnnotationValidations.validate(NonNull.class, null, mType); @@ -161,7 +162,7 @@ public final class CreateCredentialRequest implements Parcelable { AnnotationValidations.validate(NonNull.class, null, mCredentialData); mCandidateQueryData = candidateQueryData; AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData); - mRequireSystemProvider = requireSystemProvider; + mIsSystemProviderRequired = isSystemProviderRequired; } public static final @NonNull Parcelable.Creator<CreateCredentialRequest> CREATOR = diff --git a/core/java/android/credentials/GetCredentialOption.java b/core/java/android/credentials/GetCredentialOption.java index 47731dd7b517..55daf86adfe3 100644 --- a/core/java/android/credentials/GetCredentialOption.java +++ b/core/java/android/credentials/GetCredentialOption.java @@ -53,7 +53,7 @@ public final class GetCredentialOption implements Parcelable { /** * Determines whether the request must only be fulfilled by a system provider. */ - private final boolean mRequireSystemProvider; + private final boolean mIsSystemProviderRequired; /** * Returns the requested credential type. @@ -91,8 +91,8 @@ public final class GetCredentialOption implements Parcelable { * Returns true if the request must only be fulfilled by a system provider, and false * otherwise. */ - public boolean requireSystemProvider() { - return mRequireSystemProvider; + public boolean isSystemProviderRequired() { + return mIsSystemProviderRequired; } @Override @@ -100,7 +100,7 @@ public final class GetCredentialOption implements Parcelable { dest.writeString8(mType); dest.writeBundle(mCredentialRetrievalData); dest.writeBundle(mCandidateQueryData); - dest.writeBoolean(mRequireSystemProvider); + dest.writeBoolean(mIsSystemProviderRequired); } @Override @@ -114,7 +114,7 @@ public final class GetCredentialOption implements Parcelable { + "type=" + mType + ", requestData=" + mCredentialRetrievalData + ", candidateQueryData=" + mCandidateQueryData - + ", requireSystemProvider=" + mRequireSystemProvider + + ", isSystemProviderRequired=" + mIsSystemProviderRequired + "}"; } @@ -125,7 +125,7 @@ public final class GetCredentialOption implements Parcelable { * @param credentialRetrievalData the request data * @param candidateQueryData the partial request data that will be sent to the provider * during the initial credential candidate query stage - * @param requireSystemProvider whether the request must only be fulfilled by a system + * @param isSystemProviderRequired whether the request must only be fulfilled by a system * provider * @throws IllegalArgumentException If type is empty. */ @@ -133,20 +133,20 @@ public final class GetCredentialOption implements Parcelable { @NonNull String type, @NonNull Bundle credentialRetrievalData, @NonNull Bundle candidateQueryData, - boolean requireSystemProvider) { + boolean isSystemProviderRequired) { mType = Preconditions.checkStringNotEmpty(type, "type must not be empty"); mCredentialRetrievalData = requireNonNull(credentialRetrievalData, "requestData must not be null"); mCandidateQueryData = requireNonNull(candidateQueryData, "candidateQueryData must not be null"); - mRequireSystemProvider = requireSystemProvider; + mIsSystemProviderRequired = isSystemProviderRequired; } private GetCredentialOption(@NonNull Parcel in) { String type = in.readString8(); Bundle data = in.readBundle(); Bundle candidateQueryData = in.readBundle(); - boolean requireSystemProvider = in.readBoolean(); + boolean isSystemProviderRequired = in.readBoolean(); mType = type; AnnotationValidations.validate(NonNull.class, null, mType); @@ -154,7 +154,7 @@ public final class GetCredentialOption implements Parcelable { AnnotationValidations.validate(NonNull.class, null, mCredentialRetrievalData); mCandidateQueryData = candidateQueryData; AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData); - mRequireSystemProvider = requireSystemProvider; + mIsSystemProviderRequired = isSystemProviderRequired; } public static final @NonNull Parcelable.Creator<GetCredentialOption> CREATOR = diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt index 7d433648df28..a1392ba8ac13 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt @@ -414,7 +414,7 @@ class CredentialManagerRepo( credentialData, // TODO: populate with actual data /*candidateQueryData=*/ Bundle(), - /*requireSystemProvider=*/ false + /*isSystemProviderRequired=*/ false ), "com.google.android.youtube" ) @@ -429,7 +429,7 @@ class CredentialManagerRepo( data, // TODO: populate with actual data /*candidateQueryData=*/ Bundle(), - /*requireSystemProvider=*/ false + /*isSystemProviderRequired=*/ false ), "com.google.android.youtube" ) @@ -443,7 +443,7 @@ class CredentialManagerRepo( "other-sign-ins", data, /*candidateQueryData=*/ Bundle(), - /*requireSystemProvider=*/ false + /*isSystemProviderRequired=*/ false ), "com.google.android.youtube" ) @@ -457,7 +457,7 @@ class CredentialManagerRepo( ) .addGetCredentialOption( GetCredentialOption( - TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /*requireSystemProvider=*/ false) + TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /*isSystemProviderRequired=*/ false) ) .build(), "com.google.android.youtube" diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index 09f9b5eaaf6a..d9e4dc85fd77 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -269,7 +269,7 @@ class CreateFlowUtils { val createCredentialRequest = requestInfo.createCredentialRequest val createCredentialRequestJetpack = createCredentialRequest?.let { CreateCredentialRequest.createFrom( - it.type, it.credentialData, it.candidateQueryData, it.requireSystemProvider() + it.type, it.credentialData, it.candidateQueryData, it.isSystemProviderRequired() ) } when (createCredentialRequestJetpack) { diff --git a/packages/CredentialManager/src/com/android/credentialmanager/jetpack/developer/GetCredentialRequest.kt b/packages/CredentialManager/src/com/android/credentialmanager/jetpack/developer/GetCredentialRequest.kt index 18d5089828d6..5cb8d3b7bdde 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/jetpack/developer/GetCredentialRequest.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/jetpack/developer/GetCredentialRequest.kt @@ -66,7 +66,7 @@ class GetCredentialRequest constructor( it.type, it.credentialRetrievalData, it.candidateQueryData, - it.requireSystemProvider() + it.isSystemProviderRequired() ) } ) |