Merge "Renamed requireSystemProvider to isSystemProviderRequired." (f02243af) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13318,7 +13318,7 @@ package android.credentials {
	method @NonNull public android.os.Bundle getCandidateQueryData();		method @NonNull public android.os.Bundle getCandidateQueryData();
	method @NonNull public android.os.Bundle getCredentialData();		method @NonNull public android.os.Bundle getCredentialData();
	method @NonNull public String getType();		method @NonNull public String getType();
	method public boolean requireSystemProvider();		method public boolean isSystemProviderRequired();
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.credentials.CreateCredentialRequest> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.credentials.CreateCredentialRequest> CREATOR;
	}		}
	@@ -13365,7 +13365,7 @@ package android.credentials {
	method @NonNull public android.os.Bundle getCandidateQueryData();		method @NonNull public android.os.Bundle getCandidateQueryData();
	method @NonNull public android.os.Bundle getCredentialRetrievalData();		method @NonNull public android.os.Bundle getCredentialRetrievalData();
	method @NonNull public String getType();		method @NonNull public String getType();
	method public boolean requireSystemProvider();		method public boolean isSystemProviderRequired();
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.credentials.GetCredentialOption> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.credentials.GetCredentialOption> CREATOR;
	}		}

core/java/android/credentials/CreateCredentialRequest.java

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ public final class CreateCredentialRequest implements Parcelable {
	/**		/**
	* Determines whether the request must only be fulfilled by a system provider.		* 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.		* 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		* Returns true if the request must only be fulfilled by a system provider, and false
	* otherwise.		* otherwise.
	*/		*/
	public boolean requireSystemProvider() {		public boolean isSystemProviderRequired() {
	return mRequireSystemProvider;		return mIsSystemProviderRequired;
	}		}

	@Override		@Override
	@@ -108,7 +108,7 @@ public final class CreateCredentialRequest implements Parcelable {
	dest.writeString8(mType);		dest.writeString8(mType);
	dest.writeBundle(mCredentialData);		dest.writeBundle(mCredentialData);
	dest.writeBundle(mCandidateQueryData);		dest.writeBundle(mCandidateQueryData);
	dest.writeBoolean(mRequireSystemProvider);		dest.writeBoolean(mIsSystemProviderRequired);
	}		}

	@Override		@Override
	@@ -122,7 +122,7 @@ public final class CreateCredentialRequest implements Parcelable {
	+ "type=" + mType		+ "type=" + mType
	+ ", credentialData=" + mCredentialData		+ ", credentialData=" + mCredentialData
	+ ", candidateQueryData=" + mCandidateQueryData		+ ", 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 credentialData the full credential creation request data
	* @param candidateQueryData the partial request data that will be sent to the provider		* @param candidateQueryData the partial request data that will be sent to the provider
	* during the initial creation candidate query stage		* 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.		* @throws IllegalArgumentException If type is empty.
	*/		*/
	@@ -141,19 +142,19 @@ public final class CreateCredentialRequest implements Parcelable {
	@NonNull String type,		@NonNull String type,
	@NonNull Bundle credentialData,		@NonNull Bundle credentialData,
	@NonNull Bundle candidateQueryData,		@NonNull Bundle candidateQueryData,
	boolean requireSystemProvider) {		boolean isSystemProviderRequired) {
	mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");		mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");
	mCredentialData = requireNonNull(credentialData, "credentialData must not be null");		mCredentialData = requireNonNull(credentialData, "credentialData must not be null");
	mCandidateQueryData = requireNonNull(candidateQueryData,		mCandidateQueryData = requireNonNull(candidateQueryData,
	"candidateQueryData must not be null");		"candidateQueryData must not be null");
	mRequireSystemProvider = requireSystemProvider;		mIsSystemProviderRequired = isSystemProviderRequired;
	}		}

	private CreateCredentialRequest(@NonNull Parcel in) {		private CreateCredentialRequest(@NonNull Parcel in) {
	String type = in.readString8();		String type = in.readString8();
	Bundle credentialData = in.readBundle();		Bundle credentialData = in.readBundle();
	Bundle candidateQueryData = in.readBundle();		Bundle candidateQueryData = in.readBundle();
	boolean requireSystemProvider = in.readBoolean();		boolean isSystemProviderRequired = in.readBoolean();

	mType = type;		mType = type;
	AnnotationValidations.validate(NonNull.class, null, mType);		AnnotationValidations.validate(NonNull.class, null, mType);
	@@ -161,7 +162,7 @@ public final class CreateCredentialRequest implements Parcelable {
	AnnotationValidations.validate(NonNull.class, null, mCredentialData);		AnnotationValidations.validate(NonNull.class, null, mCredentialData);
	mCandidateQueryData = candidateQueryData;		mCandidateQueryData = candidateQueryData;
	AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);		AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);
	mRequireSystemProvider = requireSystemProvider;		mIsSystemProviderRequired = isSystemProviderRequired;
	}		}

	public static final @NonNull Parcelable.Creator<CreateCredentialRequest> CREATOR =		public static final @NonNull Parcelable.Creator<CreateCredentialRequest> CREATOR =

core/java/android/credentials/GetCredentialOption.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ public final class GetCredentialOption implements Parcelable {
	/**		/**
	* Determines whether the request must only be fulfilled by a system provider.		* 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.		* 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		* Returns true if the request must only be fulfilled by a system provider, and false
	* otherwise.		* otherwise.
	*/		*/
	public boolean requireSystemProvider() {		public boolean isSystemProviderRequired() {
	return mRequireSystemProvider;		return mIsSystemProviderRequired;
	}		}

	@Override		@Override
	@@ -100,7 +100,7 @@ public final class GetCredentialOption implements Parcelable {
	dest.writeString8(mType);		dest.writeString8(mType);
	dest.writeBundle(mCredentialRetrievalData);		dest.writeBundle(mCredentialRetrievalData);
	dest.writeBundle(mCandidateQueryData);		dest.writeBundle(mCandidateQueryData);
	dest.writeBoolean(mRequireSystemProvider);		dest.writeBoolean(mIsSystemProviderRequired);
	}		}

	@Override		@Override
	@@ -114,7 +114,7 @@ public final class GetCredentialOption implements Parcelable {
	+ "type=" + mType		+ "type=" + mType
	+ ", requestData=" + mCredentialRetrievalData		+ ", requestData=" + mCredentialRetrievalData
	+ ", candidateQueryData=" + mCandidateQueryData		+ ", candidateQueryData=" + mCandidateQueryData
	+ ", requireSystemProvider=" + mRequireSystemProvider		+ ", isSystemProviderRequired=" + mIsSystemProviderRequired
	+ "}";		+ "}";
	}		}

	@@ -125,7 +125,7 @@ public final class GetCredentialOption implements Parcelable {
	* @param credentialRetrievalData the request data		* @param credentialRetrievalData the request data
	* @param candidateQueryData the partial request data that will be sent to the provider		* @param candidateQueryData the partial request data that will be sent to the provider
	* during the initial credential candidate query stage		* 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		* provider
	* @throws IllegalArgumentException If type is empty.		* @throws IllegalArgumentException If type is empty.
	*/		*/
	@@ -133,20 +133,20 @@ public final class GetCredentialOption implements Parcelable {
	@NonNull String type,		@NonNull String type,
	@NonNull Bundle credentialRetrievalData,		@NonNull Bundle credentialRetrievalData,
	@NonNull Bundle candidateQueryData,		@NonNull Bundle candidateQueryData,
	boolean requireSystemProvider) {		boolean isSystemProviderRequired) {
	mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");		mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");
	mCredentialRetrievalData = requireNonNull(credentialRetrievalData,		mCredentialRetrievalData = requireNonNull(credentialRetrievalData,
	"requestData must not be null");		"requestData must not be null");
	mCandidateQueryData = requireNonNull(candidateQueryData,		mCandidateQueryData = requireNonNull(candidateQueryData,
	"candidateQueryData must not be null");		"candidateQueryData must not be null");
	mRequireSystemProvider = requireSystemProvider;		mIsSystemProviderRequired = isSystemProviderRequired;
	}		}

	private GetCredentialOption(@NonNull Parcel in) {		private GetCredentialOption(@NonNull Parcel in) {
	String type = in.readString8();		String type = in.readString8();
	Bundle data = in.readBundle();		Bundle data = in.readBundle();
	Bundle candidateQueryData = in.readBundle();		Bundle candidateQueryData = in.readBundle();
	boolean requireSystemProvider = in.readBoolean();		boolean isSystemProviderRequired = in.readBoolean();

	mType = type;		mType = type;
	AnnotationValidations.validate(NonNull.class, null, mType);		AnnotationValidations.validate(NonNull.class, null, mType);
	@@ -154,7 +154,7 @@ public final class GetCredentialOption implements Parcelable {
	AnnotationValidations.validate(NonNull.class, null, mCredentialRetrievalData);		AnnotationValidations.validate(NonNull.class, null, mCredentialRetrievalData);
	mCandidateQueryData = candidateQueryData;		mCandidateQueryData = candidateQueryData;
	AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);		AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);
	mRequireSystemProvider = requireSystemProvider;		mIsSystemProviderRequired = isSystemProviderRequired;
	}		}

	public static final @NonNull Parcelable.Creator<GetCredentialOption> CREATOR =		public static final @NonNull Parcelable.Creator<GetCredentialOption> CREATOR =

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -414,7 +414,7 @@ class CredentialManagerRepo(
	credentialData,		credentialData,
	// TODO: populate with actual data		// TODO: populate with actual data
	/candidateQueryData=/ Bundle(),		/candidateQueryData=/ Bundle(),
	/requireSystemProvider=/ false		/isSystemProviderRequired=/ false
	),		),
	"com.google.android.youtube"		"com.google.android.youtube"
	)		)
	@@ -429,7 +429,7 @@ class CredentialManagerRepo(
	data,		data,
	// TODO: populate with actual data		// TODO: populate with actual data
	/candidateQueryData=/ Bundle(),		/candidateQueryData=/ Bundle(),
	/requireSystemProvider=/ false		/isSystemProviderRequired=/ false
	),		),
	"com.google.android.youtube"		"com.google.android.youtube"
	)		)
	@@ -443,7 +443,7 @@ class CredentialManagerRepo(
	"other-sign-ins",		"other-sign-ins",
	data,		data,
	/candidateQueryData=/ Bundle(),		/candidateQueryData=/ Bundle(),
	/requireSystemProvider=/ false		/isSystemProviderRequired=/ false
	),		),
	"com.google.android.youtube"		"com.google.android.youtube"
	)		)
	@@ -457,7 +457,7 @@ class CredentialManagerRepo(
	)		)
	.addGetCredentialOption(		.addGetCredentialOption(
	GetCredentialOption(		GetCredentialOption(
	TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /requireSystemProvider=/ false)		TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /isSystemProviderRequired=/ false)
	)		)
	.build(),		.build(),
	"com.google.android.youtube"		"com.google.android.youtube"

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -269,7 +269,7 @@ class CreateFlowUtils {
	val createCredentialRequest = requestInfo.createCredentialRequest		val createCredentialRequest = requestInfo.createCredentialRequest
	val createCredentialRequestJetpack = createCredentialRequest?.let {		val createCredentialRequestJetpack = createCredentialRequest?.let {
	CreateCredentialRequest.createFrom(		CreateCredentialRequest.createFrom(
	it.type, it.credentialData, it.candidateQueryData, it.requireSystemProvider()		it.type, it.credentialData, it.candidateQueryData, it.isSystemProviderRequired()
	)		)
	}		}
	when (createCredentialRequestJetpack) {		when (createCredentialRequestJetpack) {