Merge "Make framework classes non final" (383a0536) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −11

Original line number	Diff line number	Diff line
		@@ -39711,7 +39711,7 @@ package android.service.controls.templates {

		package android.service.credentials {

		public final class Action implements android.os.Parcelable {
		public class Action implements android.os.Parcelable {
		ctor public Action(@NonNull android.app.slice.Slice, @NonNull android.app.PendingIntent);
		method public int describeContents();
		method @NonNull public android.app.PendingIntent getPendingIntent();
		@@ -39720,7 +39720,7 @@ package android.service.credentials {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.Action> CREATOR;
		}

		public final class BeginCreateCredentialRequest implements android.os.Parcelable {
		public class BeginCreateCredentialRequest implements android.os.Parcelable {
		ctor public BeginCreateCredentialRequest(@NonNull android.service.credentials.CallingAppInfo, @NonNull String, @NonNull android.os.Bundle);
		method public int describeContents();
		method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();
		@@ -39746,7 +39746,7 @@ package android.service.credentials {
		method @NonNull public android.service.credentials.BeginCreateCredentialResponse.Builder setRemoteCreateEntry(@Nullable android.service.credentials.CreateEntry);
		}

		public final class BeginGetCredentialOption implements android.os.Parcelable {
		public class BeginGetCredentialOption implements android.os.Parcelable {
		ctor public BeginGetCredentialOption(@NonNull String, @NonNull android.os.Bundle);
		method public int describeContents();
		method @NonNull public android.os.Bundle getCandidateQueryData();
		@@ -39808,7 +39808,7 @@ package android.service.credentials {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.CreateCredentialRequest> CREATOR;
		}

		public final class CreateEntry implements android.os.Parcelable {
		public class CreateEntry implements android.os.Parcelable {
		ctor public CreateEntry(@NonNull android.app.slice.Slice, @NonNull android.app.PendingIntent);
		method public int describeContents();
		method @NonNull public android.app.PendingIntent getPendingIntent();
		@@ -39817,7 +39817,8 @@ package android.service.credentials {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.CreateEntry> CREATOR;
		}

		public final class CredentialEntry implements android.os.Parcelable {
		public class CredentialEntry implements android.os.Parcelable {
		ctor public CredentialEntry(@NonNull String, @NonNull android.app.slice.Slice, @NonNull android.app.PendingIntent, boolean);
		method public int describeContents();
		method @NonNull public android.app.PendingIntent getPendingIntent();
		method @NonNull public android.app.slice.Slice getSlice();
		@@ -39827,12 +39828,6 @@ package android.service.credentials {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.CredentialEntry> CREATOR;
		}

		public static final class CredentialEntry.Builder {
		ctor public CredentialEntry.Builder(@NonNull String, @NonNull android.app.slice.Slice, @NonNull android.app.PendingIntent);
		method @NonNull public android.service.credentials.CredentialEntry build();
		method @NonNull public android.service.credentials.CredentialEntry.Builder setAutoSelectAllowed(@NonNull boolean);
		}

		public abstract class CredentialProviderService extends android.app.Service {
		ctor public CredentialProviderService();
		method public abstract void onBeginCreateCredential(@NonNull android.service.credentials.BeginCreateCredentialRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.service.credentials.BeginCreateCredentialResponse,android.credentials.CreateCredentialException>);

core/java/android/service/credentials/Action.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.service.credentials;

		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.app.PendingIntent;
		import android.app.slice.Slice;
		import android.os.Parcel;
		@@ -27,8 +28,14 @@ import java.util.Objects;
		/**
		* An action defined by the provider that intents into the provider's app for specific
		* user actions.
		*
		* <p>Any class that derives this class must only add extra field values to the {@code slice}
		* object passed into the constructor. Any other field will not be parceled through. If the
		* derived class has custom parceling implementation, this class will not be able to unpack
		* the parcel without having access to that implementation.
		*/
		public final class Action implements Parcelable {
		@SuppressLint("ParcelNotFinal")
		public class Action implements Parcelable {
		/** Slice object containing display content to be displayed with this action on the UI. */
		private final @NonNull Slice mSlice;
		/** The pending intent to be invoked when the user selects this action. */

core/java/android/service/credentials/BeginCreateCredentialRequest.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.service.credentials;

		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -29,8 +30,14 @@ import java.util.Objects;
		* Request for beginning a create credential request.
		*
		* See {@link BeginCreateCredentialResponse} for the counterpart response
		*
		* <p>Any class that derives this class must only add extra field values to the {@code slice}
		* object passed into the constructor. Any other field will not be parceled through. If the
		* derived class has custom parceling implementation, this class will not be able to unpack
		* the parcel without having access to that implementation.
		*/
		public final class BeginCreateCredentialRequest implements Parcelable {
		@SuppressLint("ParcelNotFinal")
		public class BeginCreateCredentialRequest implements Parcelable {
		private final @NonNull CallingAppInfo mCallingAppInfo;
		private final @NonNull String mType;
		private final @NonNull Bundle mData;

core/java/android/service/credentials/BeginGetCredentialOption.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.service.credentials;
		import static java.util.Objects.requireNonNull;

		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -30,8 +31,14 @@ import com.android.internal.util.Preconditions;
		* A specific type of credential request to be sent to the provider during the query phase of
		* a get flow. This request contains limited parameters needed to populate a list of
		* {@link CredentialEntry} on the {@link BeginGetCredentialResponse}.
		*
		* <p>Any class that derives this class must only add extra field values to the {@code slice}
		* object passed into the constructor. Any other field will not be parceled through. If the
		* derived class has custom parceling implementation, this class will not be able to unpack
		* the parcel without having access to that implementation.
		*/
		public final class BeginGetCredentialOption implements Parcelable {
		@SuppressLint("ParcelNotFinal")
		public class BeginGetCredentialOption implements Parcelable {

		/**
		* The requested credential type.

core/java/android/service/credentials/CreateEntry.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.service.credentials;

		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.app.PendingIntent;
		import android.app.slice.Slice;
		import android.os.Parcel;
		@@ -25,8 +26,14 @@ import android.os.Parcelable;
		/**
		* An entry to be shown on the UI. This entry represents where the credential to be created will
		* be stored. Examples include user's account, family group etc.
		*
		* <p>Any class that derives this class must only add extra field values to the {@code slice}
		* object passed into the constructor. Any other field will not be parceled through. If the
		* derived class has custom parceling implementation, this class will not be able to unpack
		* the parcel without having access to that implementation.
		*/
		public final class CreateEntry implements Parcelable {
		@SuppressLint("ParcelNotFinal")
		public class CreateEntry implements Parcelable {
		private final @NonNull Slice mSlice;
		private final @NonNull PendingIntent mPendingIntent;