Merge "Remove header from GET & CREATE provider APIs Test: Built & deployed locally" (7fa1b760) · Commits · e / os / android_frameworks_base

core/java/android/service/credentials/CreateCredentialResponse.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -33,13 +33,11 @@ import java.util.Objects;
		* @hide
		*/
		public final class CreateCredentialResponse implements Parcelable {
		private final @Nullable CharSequence mHeader;
		private final @NonNull List<SaveEntry> mSaveEntries;
		private final @Nullable Action mRemoteSaveEntry;
		//TODO : Add actions if needed

		private CreateCredentialResponse(@NonNull Parcel in) {
		mHeader = in.readCharSequence();
		List<SaveEntry> saveEntries = new ArrayList<>();
		in.readTypedList(saveEntries, SaveEntry.CREATOR);
		mSaveEntries = saveEntries;
		@@ -48,7 +46,6 @@ public final class CreateCredentialResponse implements Parcelable {

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeCharSequence(mHeader);
		dest.writeTypedList(mSaveEntries);
		dest.writeTypedObject(mRemoteSaveEntry, flags);
		}
		@@ -72,21 +69,14 @@ public final class CreateCredentialResponse implements Parcelable {
		};

		/* package-private */ CreateCredentialResponse(
		@Nullable CharSequence header,
		@NonNull List<SaveEntry> saveEntries,
		@Nullable Action remoteSaveEntry) {
		this.mHeader = header;
		this.mSaveEntries = saveEntries;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mSaveEntries);
		this.mRemoteSaveEntry = remoteSaveEntry;
		}

		/** Returns the header to be displayed on the UI. */
		public @Nullable CharSequence getHeader() {
		return mHeader;
		}

		/** Returns the list of save entries to be displayed on the UI. */
		public @NonNull List<SaveEntry> getSaveEntries() {
		return mSaveEntries;
		@@ -102,17 +92,9 @@ public final class CreateCredentialResponse implements Parcelable {
		*/
		@SuppressWarnings("WeakerAccess")
		public static final class Builder {

		private @Nullable CharSequence mHeader;
		private @NonNull List<SaveEntry> mSaveEntries = new ArrayList<>();
		private @Nullable Action mRemoteSaveEntry;

		/** Sets the header to be displayed on the UI. */
		public @NonNull Builder setHeader(@Nullable CharSequence header) {
		mHeader = header;
		return this;
		}

		/**
		* Sets the list of save entries to be shown on the UI.
		*
		@@ -154,7 +136,6 @@ public final class CreateCredentialResponse implements Parcelable {
		Preconditions.checkCollectionNotEmpty(mSaveEntries, "saveEntries must "
		+ "not be empty");
		return new CreateCredentialResponse(
		mHeader,
		mSaveEntries,
		mRemoteSaveEntry);
		}

core/java/android/service/credentials/CredentialsDisplayContent.java

+2 −25

Original line number	Diff line number	Diff line
		@@ -34,9 +34,6 @@ import java.util.Objects;
		* @hide
		*/
		public final class CredentialsDisplayContent implements Parcelable {
		/** Header to be displayed on the UI. */
		private final @Nullable CharSequence mHeader;

		/** List of credential entries to be displayed on the UI. */
		private final @NonNull List<CredentialEntry> mCredentialEntries;

		@@ -46,18 +43,15 @@ public final class CredentialsDisplayContent implements Parcelable {
		/** Remote credential entry to get the response from a different device. */
		private final @Nullable Action mRemoteCredentialEntry;

		private CredentialsDisplayContent(@Nullable CharSequence header,
		@NonNull List<CredentialEntry> credentialEntries,
		private CredentialsDisplayContent(@NonNull List<CredentialEntry> credentialEntries,
		@NonNull List<Action> actions,
		@Nullable Action remoteCredentialEntry) {
		mHeader = header;
		mCredentialEntries = credentialEntries;
		mActions = actions;
		mRemoteCredentialEntry = remoteCredentialEntry;
		}

		private CredentialsDisplayContent(@NonNull Parcel in) {
		mHeader = in.readCharSequence();
		List<CredentialEntry> credentialEntries = new ArrayList<>();
		in.readTypedList(credentialEntries, CredentialEntry.CREATOR);
		mCredentialEntries = credentialEntries;
		@@ -87,19 +81,11 @@ public final class CredentialsDisplayContent implements Parcelable {

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeCharSequence(mHeader);
		dest.writeTypedList(mCredentialEntries, flags);
		dest.writeTypedList(mActions, flags);
		dest.writeTypedObject(mRemoteCredentialEntry, flags);
		}

		/**
		* Returns the header to be displayed on the UI.
		*/
		public @Nullable CharSequence getHeader() {
		return mHeader;
		}

		/**
		* Returns the list of credential entries to be displayed on the UI.
		*/
		@@ -125,19 +111,10 @@ public final class CredentialsDisplayContent implements Parcelable {
		* Builds an instance of {@link CredentialsDisplayContent}.
		*/
		public static final class Builder {
		private CharSequence mHeader;
		private List<CredentialEntry> mCredentialEntries = new ArrayList<>();
		private List<Action> mActions = new ArrayList<>();
		private Action mRemoteCredentialEntry;

		/**
		* Sets the header to be displayed on the UI.
		*/
		public @NonNull Builder setHeader(@Nullable CharSequence header) {
		mHeader = header;
		return this;
		}

		/**
		* Sets the remote credential entry to be displayed on the UI.
		*/
		@@ -208,7 +185,7 @@ public final class CredentialsDisplayContent implements Parcelable {
		throw new IllegalStateException("credentialEntries and actions must not both "
		+ "be empty");
		}
		return new CredentialsDisplayContent(mHeader, mCredentialEntries, mActions,
		return new CredentialsDisplayContent(mCredentialEntries, mActions,
		mRemoteCredentialEntry);
		}
		}