Merge "Renamed the GetCredentialOption to CredentialOptions." (fad9267d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+17 −17

Original line number	Diff line number	Diff line
		@@ -13509,6 +13509,18 @@ package android.credentials {
		method public void unregisterCredentialDescription(@NonNull android.credentials.UnregisterCredentialDescriptionRequest);
		}

		public final class CredentialOption implements android.os.Parcelable {
		ctor public CredentialOption(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.Bundle, boolean);
		method public int describeContents();
		method @NonNull public android.os.Bundle getCandidateQueryData();
		method @NonNull public android.os.Bundle getCredentialRetrievalData();
		method @NonNull public String getType();
		method public boolean isSystemProviderRequired();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.credentials.CredentialOption> CREATOR;
		field public static final String FLATTENED_REQUEST = "android.credentials.GetCredentialOption.FLATTENED_REQUEST_STRING";
		}

		public class GetCredentialException extends java.lang.Exception {
		ctor public GetCredentialException(@NonNull String, @Nullable String);
		ctor public GetCredentialException(@NonNull String, @Nullable String, @Nullable Throwable);
		@@ -13521,31 +13533,19 @@ package android.credentials {
		field @NonNull public static final String TYPE_USER_CANCELED = "android.credentials.GetCredentialException.TYPE_USER_CANCELED";
		}

		public final class GetCredentialOption implements android.os.Parcelable {
		ctor public GetCredentialOption(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.Bundle, boolean);
		method public int describeContents();
		method @NonNull public android.os.Bundle getCandidateQueryData();
		method @NonNull public android.os.Bundle getCredentialRetrievalData();
		method @NonNull public String getType();
		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;
		field public static final String FLATTENED_REQUEST = "android.credentials.GetCredentialOption.FLATTENED_REQUEST_STRING";
		}

		public final class GetCredentialRequest implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.List<android.credentials.CredentialOption> getCredentialOptions();
		method @NonNull public android.os.Bundle getData();
		method @NonNull public java.util.List<android.credentials.GetCredentialOption> getGetCredentialOptions();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.credentials.GetCredentialRequest> CREATOR;
		}

		public static final class GetCredentialRequest.Builder {
		ctor public GetCredentialRequest.Builder(@NonNull android.os.Bundle);
		method @NonNull public android.credentials.GetCredentialRequest.Builder addGetCredentialOption(@NonNull android.credentials.GetCredentialOption);
		method @NonNull public android.credentials.GetCredentialRequest.Builder addCredentialOption(@NonNull android.credentials.CredentialOption);
		method @NonNull public android.credentials.GetCredentialRequest build();
		method @NonNull public android.credentials.GetCredentialRequest.Builder setGetCredentialOptions(@NonNull java.util.List<android.credentials.GetCredentialOption>);
		method @NonNull public android.credentials.GetCredentialRequest.Builder setCredentialOptions(@NonNull java.util.List<android.credentials.CredentialOption>);
		}

		public final class GetCredentialResponse implements android.os.Parcelable {
		@@ -40295,10 +40295,10 @@ package android.service.credentials {
		}

		public final class GetCredentialRequest implements android.os.Parcelable {
		ctor public GetCredentialRequest(@NonNull android.service.credentials.CallingAppInfo, @NonNull android.credentials.GetCredentialOption);
		ctor public GetCredentialRequest(@NonNull android.service.credentials.CallingAppInfo, @NonNull android.credentials.CredentialOption);
		method public int describeContents();
		method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();
		method @NonNull public android.credentials.GetCredentialOption getGetCredentialOption();
		method @NonNull public android.credentials.CredentialOption getGetCredentialOption();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.GetCredentialRequest> CREATOR;
		}

core/java/android/credentials/GetCredentialOption.java→core/java/android/credentials/CredentialOption.java

+26 −24

Original line number	Diff line number	Diff line
		@@ -27,9 +27,11 @@ import com.android.internal.util.AnnotationValidations;
		import com.android.internal.util.Preconditions;

		/**
		* A specific type of credential request.
		* Information about a specific type of credential to be requested during a {@link
		* CredentialManager#getCredential(GetCredentialRequest, Activity, CancellationSignal, Executor,
		* OutcomeReceiver)} operation.
		*/
		public final class GetCredentialOption implements Parcelable {
		public final class CredentialOption implements Parcelable {

		/**
		* Bundle key to the flattened version of the JSON request string. Framework will use this key
		@@ -118,7 +120,7 @@ public final class GetCredentialOption implements Parcelable {

		@Override
		public String toString() {
		return "GetCredentialOption {"
		return "CredentialOption {"
		+ "type=" + mType
		+ ", requestData=" + mCredentialRetrievalData
		+ ", candidateQueryData=" + mCandidateQueryData
		@@ -127,7 +129,7 @@ public final class GetCredentialOption implements Parcelable {
		}

		/**
		* Constructs a {@link GetCredentialOption}.
		* Constructs a {@link CredentialOption}.
		*
		* @param type the requested credential type
		* @param credentialRetrievalData the request data
		@@ -137,7 +139,7 @@ public final class GetCredentialOption implements Parcelable {
		* provider
		* @throws IllegalArgumentException If type is empty.
		*/
		public GetCredentialOption(
		public CredentialOption(
		@NonNull String type,
		@NonNull Bundle credentialRetrievalData,
		@NonNull Bundle candidateQueryData,
		@@ -150,7 +152,7 @@ public final class GetCredentialOption implements Parcelable {
		mIsSystemProviderRequired = isSystemProviderRequired;
		}

		private GetCredentialOption(@NonNull Parcel in) {
		private CredentialOption(@NonNull Parcel in) {
		String type = in.readString8();
		Bundle data = in.readBundle();
		Bundle candidateQueryData = in.readBundle();
		@@ -165,16 +167,16 @@ public final class GetCredentialOption implements Parcelable {
		mIsSystemProviderRequired = isSystemProviderRequired;
		}

		public static final @NonNull Parcelable.Creator<GetCredentialOption> CREATOR =
		new Parcelable.Creator<GetCredentialOption>() {
		@NonNull
		public static final Parcelable.Creator<CredentialOption> CREATOR = new Parcelable.Creator<>() {
		@Override
		public GetCredentialOption[] newArray(int size) {
		return new GetCredentialOption[size];
		public CredentialOption[] newArray(int size) {
		return new CredentialOption[size];
		}

		@Override
		public GetCredentialOption createFromParcel(@NonNull Parcel in) {
		return new GetCredentialOption(in);
		public CredentialOption createFromParcel(@NonNull Parcel in) {
		return new CredentialOption(in);
		}
		};
		}

core/java/android/credentials/GetCredentialRequest.java

+34 −35

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public final class GetCredentialRequest implements Parcelable {
		* The list of credential requests.
		*/
		@NonNull
		private final List<GetCredentialOption> mGetCredentialOptions;
		private final List<CredentialOption> mCredentialOptions;

		/**
		* The top request level data.
		@@ -51,8 +51,8 @@ public final class GetCredentialRequest implements Parcelable {
		* Returns the list of credential options to be requested.
		*/
		@NonNull
		public List<GetCredentialOption> getGetCredentialOptions() {
		return mGetCredentialOptions;
		public List<CredentialOption> getCredentialOptions() {
		return mCredentialOptions;
		}

		/**
		@@ -65,7 +65,7 @@ public final class GetCredentialRequest implements Parcelable {

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeTypedList(mGetCredentialOptions, flags);
		dest.writeTypedList(mCredentialOptions, flags);
		dest.writeBundle(mData);
		}

		@@ -76,29 +76,29 @@ public final class GetCredentialRequest implements Parcelable {

		@Override
		public String toString() {
		return "GetCredentialRequest {getCredentialOption=" + mGetCredentialOptions
		return "GetCredentialRequest {credentialOption=" + mCredentialOptions
		+ ", data=" + mData
		+ "}";
		}

		private GetCredentialRequest(@NonNull List<GetCredentialOption> getCredentialOptions,
		private GetCredentialRequest(@NonNull List<CredentialOption> credentialOptions,
		@NonNull Bundle data) {
		Preconditions.checkCollectionNotEmpty(
		getCredentialOptions,
		/valueName=/ "getCredentialOptions");
		credentialOptions,
		/valueName=/ "credentialOptions");
		Preconditions.checkCollectionElementsNotNull(
		getCredentialOptions,
		/valueName=/ "getCredentialOptions");
		mGetCredentialOptions = getCredentialOptions;
		credentialOptions,
		/valueName=/ "credentialOptions");
		mCredentialOptions = credentialOptions;
		mData = requireNonNull(data,
		"data must not be null");
		}

		private GetCredentialRequest(@NonNull Parcel in) {
		List<GetCredentialOption> getCredentialOptions = new ArrayList<GetCredentialOption>();
		in.readTypedList(getCredentialOptions, GetCredentialOption.CREATOR);
		mGetCredentialOptions = getCredentialOptions;
		AnnotationValidations.validate(NonNull.class, null, mGetCredentialOptions);
		List<CredentialOption> credentialOptions = new ArrayList<CredentialOption>();
		in.readTypedList(credentialOptions, CredentialOption.CREATOR);
		mCredentialOptions = credentialOptions;
		AnnotationValidations.validate(NonNull.class, null, mCredentialOptions);


		Bundle data = in.readBundle();
		@@ -106,8 +106,8 @@ public final class GetCredentialRequest implements Parcelable {
		AnnotationValidations.validate(NonNull.class, null, mData);
		}

		public static final @NonNull Parcelable.Creator<GetCredentialRequest> CREATOR =
		new Parcelable.Creator<GetCredentialRequest>() {
		@NonNull public static final Parcelable.Creator<GetCredentialRequest> CREATOR =
		new Parcelable.Creator<>() {
		@Override
		public GetCredentialRequest[] newArray(int size) {
		return new GetCredentialRequest[size];
		@@ -123,7 +123,7 @@ public final class GetCredentialRequest implements Parcelable {
		public static final class Builder {

		@NonNull
		private List<GetCredentialOption> mGetCredentialOptions = new ArrayList<>();
		private List<CredentialOption> mCredentialOptions = new ArrayList<>();

		@NonNull
		private final Bundle mData;
		@@ -136,43 +136,42 @@ public final class GetCredentialRequest implements Parcelable {
		}

		/**
		* Adds a specific type of {@link GetCredentialOption}.
		* Adds a specific type of {@link CredentialOption}.
		*/
		@NonNull
		public Builder addGetCredentialOption(
		@NonNull GetCredentialOption getCredentialOption) {
		mGetCredentialOptions.add(requireNonNull(
		getCredentialOption, "getCredentialOption must not be null"));
		public Builder addCredentialOption(@NonNull CredentialOption credentialOption) {
		mCredentialOptions.add(requireNonNull(
		credentialOption, "credentialOption must not be null"));
		return this;
		}

		/**
		* Sets the list of {@link GetCredentialOption}.
		* Sets the list of {@link CredentialOption}.
		*/
		@NonNull
		public Builder setGetCredentialOptions(
		@NonNull List<GetCredentialOption> getCredentialOptions) {
		public Builder setCredentialOptions(
		@NonNull List<CredentialOption> credentialOptions) {
		Preconditions.checkCollectionElementsNotNull(
		getCredentialOptions,
		/valueName=/ "getCredentialOptions");
		mGetCredentialOptions = new ArrayList<>(getCredentialOptions);
		credentialOptions,
		/valueName=/ "credentialOptions");
		mCredentialOptions = new ArrayList<>(credentialOptions);
		return this;
		}

		/**
		* Builds a {@link GetCredentialRequest}.
		*
		* @throws IllegalArgumentException If getCredentialOptions is empty.
		* @throws IllegalArgumentException If credentialOptions is empty.
		*/
		@NonNull
		public GetCredentialRequest build() {
		Preconditions.checkCollectionNotEmpty(
		mGetCredentialOptions,
		/valueName=/ "getCredentialOptions");
		mCredentialOptions,
		/valueName=/ "credentialOptions");
		Preconditions.checkCollectionElementsNotNull(
		mGetCredentialOptions,
		/valueName=/ "getCredentialOptions");
		return new GetCredentialRequest(mGetCredentialOptions, mData);
		mCredentialOptions,
		/valueName=/ "credentialOptions");
		return new GetCredentialRequest(mCredentialOptions, mData);
		}
		}
		}

core/java/android/service/credentials/BeginGetCredentialRequest.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.service.credentials;
		import android.annotation.NonNull;
		import android.app.PendingIntent;
		import android.content.Intent;
		import android.credentials.GetCredentialOption;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -33,7 +32,7 @@ import java.util.Objects;
		/**
		* Query stage request for getting user's credentials from a given credential provider.
		*
		* <p>This request contains a list of {@link GetCredentialOption} that have parameters
		* <p>This request contains a list of {@link BeginGetCredentialOption} that have parameters
		* to be used to query credentials, and return a list of {@link CredentialEntry} to be set
		* on the {@link BeginGetCredentialResponse}. This list is then shown to the user on a selector.
		*

core/java/android/service/credentials/CredentialProviderService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ public abstract class CredentialProviderService extends Service {
		*
		* <p>This API denotes a query stage request for getting user's credentials from a given
		* credential provider. The request contains a list of
		* {@link android.credentials.GetCredentialOption} that have parameters to be used for
		* {@link BeginGetCredentialOption} that have parameters to be used for
		* populating candidate credentials, as a list of {@link CredentialEntry} to be set
		* on the {@link BeginGetCredentialResponse}. This list is then shown to the user on a
		* selector.