Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f768177 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Make frameworks classes final for credential manager" into udc-dev am: 78fe4c3e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22101274



Change-Id: Ie1f2d0399ed9ec14d1111e86062456070750e13f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89b3b7ab 78fe4c3e

core/api/current.txt

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














package android.service.credentials {



























  public class Action implements android.os.Parcelable {













  public final class Action implements android.os.Parcelable {















    ctor public Action(@NonNull android.app.slice.Slice);















    method public int describeContents();















    method @NonNull public android.app.slice.Slice getSlice();









@@ -40585,7 +40585,7 @@ package android.service.credentials {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.Action> CREATOR;















  }



























  public class BeginCreateCredentialRequest implements android.os.Parcelable {













  public final class BeginCreateCredentialRequest implements android.os.Parcelable {















    ctor public BeginCreateCredentialRequest(@NonNull String, @NonNull android.os.Bundle, @Nullable android.service.credentials.CallingAppInfo);















    ctor public BeginCreateCredentialRequest(@NonNull String, @NonNull android.os.Bundle);















    method public int describeContents();










@@ -40613,7 +40613,7 @@ package android.service.credentials {













    method @NonNull @RequiresPermission(android.Manifest.permission.PROVIDE_REMOTE_CREDENTIALS) public android.service.credentials.BeginCreateCredentialResponse.Builder setRemoteCreateEntry(@Nullable android.service.credentials.RemoteEntry);















  }



























  public class BeginGetCredentialOption implements android.os.Parcelable {













  public final class BeginGetCredentialOption implements android.os.Parcelable {















    ctor public BeginGetCredentialOption(@NonNull String, @NonNull String, @NonNull android.os.Bundle);















    method public int describeContents();















    method @NonNull public android.os.Bundle getCandidateQueryData();










@@ -40692,7 +40692,7 @@ package android.service.credentials {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.CreateCredentialRequest> CREATOR;















  }



























  public class CreateEntry implements android.os.Parcelable {













  public final class CreateEntry implements android.os.Parcelable {















    ctor public CreateEntry(@NonNull android.app.slice.Slice);















    method public int describeContents();















    method @NonNull public android.app.slice.Slice getSlice();









@@ -40700,7 +40700,7 @@ package android.service.credentials {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.CreateEntry> CREATOR;















  }



























  public class CredentialEntry implements android.os.Parcelable {













  public final class CredentialEntry implements android.os.Parcelable {















    ctor public CredentialEntry(@NonNull String, @NonNull String, @NonNull android.app.slice.Slice);















    ctor public CredentialEntry(@NonNull android.service.credentials.BeginGetCredentialOption, @NonNull android.app.slice.Slice);















    ctor public CredentialEntry(@NonNull String, @NonNull android.app.slice.Slice);










@@ -40740,7 +40740,7 @@ package android.service.credentials {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.GetCredentialRequest> CREATOR;















  }



























  public class RemoteEntry implements android.os.Parcelable {













  public final class RemoteEntry implements android.os.Parcelable {















    ctor public RemoteEntry(@NonNull android.app.slice.Slice);















    method public int describeContents();















    method @NonNull public android.app.slice.Slice getSlice();

























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



+1
−8






























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













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;









@@ -31,14 +30,8 @@ import java.util.Objects;













 *















 * <p>If user selects this action entry, the corresponding {@link PendingIntent} set on the















 * {@code slice} as a {@link androidx.slice.core.SliceAction} will get invoked.













 *













 * <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.















 */













@SuppressLint("ParcelNotFinal")













public class Action implements Parcelable {













public final class Action implements Parcelable {















    /** Slice object containing display content to be displayed with this action on the UI. */















    @NonNull















    private final Slice mSlice;

































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



+1
−8






























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.service.credentials;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.SuppressLint;















import android.os.Bundle;















import android.os.Parcel;















import android.os.Parcelable;









@@ -29,14 +28,8 @@ import com.android.internal.util.Preconditions;













 * 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.















 */













@SuppressLint("ParcelNotFinal")













public class BeginCreateCredentialRequest implements Parcelable {













public final class BeginCreateCredentialRequest implements Parcelable {















    private final @Nullable CallingAppInfo mCallingAppInfo;















    private final @NonNull String mType;















    private final @NonNull Bundle mData;

































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



+1
−8






























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













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,14 +28,8 @@ 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.















 */













@SuppressLint("ParcelNotFinal")













public class BeginGetCredentialOption implements Parcelable {













public final class BeginGetCredentialOption implements Parcelable {















    private static final String BUNDLE_ID_KEY =















            "android.service.credentials.BeginGetCredentialOption.BUNDLE_ID_KEY";















    /**

































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



+1
−8






























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













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;









@@ -33,14 +32,8 @@ import android.os.Parcelable;













 * the {@link android.app.Activity} result should be set to {@link android.app.Activity#RESULT_OK},















 * and the {@link CredentialProviderService#EXTRA_CREATE_CREDENTIAL_RESPONSE} must be set with a















 * {@link android.credentials.CreateCredentialResponse} object.













 *













 * <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.















 */













@SuppressLint("ParcelNotFinal")













public class CreateEntry implements Parcelable {













public final class CreateEntry implements Parcelable {















    private final @NonNull Slice mSlice;































    private CreateEntry(@NonNull Parcel in) {