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

Commit 4cea151f authored by Reema Bajwa's avatar Reema Bajwa Committed by Android (Google) Code Review
Browse files

Merge "Change includes: Use CallingAppInfo instead of callingPackage in... 

Merge "Change includes: Use CallingAppInfo instead of callingPackage in get/create requests Change exceptions for providers Test: make"
parents 9e9e673b d0ae86d7

core/api/current.txt

+20 −29
Original line number Diff line number Diff line
@@ -39530,9 +39530,9 @@ package android.service.credentials { 
  }















  public final class BeginCreateCredentialRequest implements android.os.Parcelable {













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













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















    method public int describeContents();













    method @NonNull public String getCallingPackage();













    method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();















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















    method @NonNull public String getType();















    method public void writeToParcel(@NonNull android.os.Parcel, int);










@@ -39564,29 +39564,29 @@ package android.service.credentials {













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















  }



























  public final class BeginGetCredentialsRequest implements android.os.Parcelable {













  public final class BeginGetCredentialRequest implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public java.util.List<android.service.credentials.BeginGetCredentialOption> getBeginGetCredentialOptions();













    method @NonNull public String getCallingPackage();













    method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













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













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















  }



























  public static final class BeginGetCredentialsRequest.Builder {













    ctor public BeginGetCredentialsRequest.Builder(@NonNull String);













    method @NonNull public android.service.credentials.BeginGetCredentialsRequest.Builder addBeginGetCredentialOption(@NonNull android.service.credentials.BeginGetCredentialOption);













    method @NonNull public android.service.credentials.BeginGetCredentialsRequest build();













    method @NonNull public android.service.credentials.BeginGetCredentialsRequest.Builder setBeginGetCredentialOptions(@NonNull java.util.List<android.service.credentials.BeginGetCredentialOption>);













  public static final class BeginGetCredentialRequest.Builder {













    ctor public BeginGetCredentialRequest.Builder(@NonNull android.service.credentials.CallingAppInfo);













    method @NonNull public android.service.credentials.BeginGetCredentialRequest.Builder addBeginGetCredentialOption(@NonNull android.service.credentials.BeginGetCredentialOption);













    method @NonNull public android.service.credentials.BeginGetCredentialRequest build();













    method @NonNull public android.service.credentials.BeginGetCredentialRequest.Builder setBeginGetCredentialOptions(@NonNull java.util.List<android.service.credentials.BeginGetCredentialOption>);















  }



























  public final class BeginGetCredentialsResponse implements android.os.Parcelable {













    method @NonNull public static android.service.credentials.BeginGetCredentialsResponse createWithAuthentication(@NonNull android.service.credentials.Action);













    method @NonNull public static android.service.credentials.BeginGetCredentialsResponse createWithResponseContent(@NonNull android.service.credentials.CredentialsResponseContent);













  public final class BeginGetCredentialResponse implements android.os.Parcelable {













    method @NonNull public static android.service.credentials.BeginGetCredentialResponse createWithAuthentication(@NonNull android.service.credentials.Action);













    method @NonNull public static android.service.credentials.BeginGetCredentialResponse createWithResponseContent(@NonNull android.service.credentials.CredentialsResponseContent);















    method public int describeContents();















    method @Nullable public android.service.credentials.Action getAuthenticationAction();















    method @Nullable public android.service.credentials.CredentialsResponseContent getCredentialsResponseContent();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













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













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















  }





























  public final class CallingAppInfo implements android.os.Parcelable {









@@ -39599,9 +39599,9 @@ package android.service.credentials {













  }





























  public final class CreateCredentialRequest implements android.os.Parcelable {













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













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















    method public int describeContents();













    method @NonNull public String getCallingPackage();













    method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();















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















    method @NonNull public String getType();















    method public void writeToParcel(@NonNull android.os.Parcel, int);










@@ -39633,19 +39633,10 @@ package android.service.credentials {













    method @NonNull public android.service.credentials.CredentialEntry.Builder setAutoSelectAllowed(@NonNull boolean);















  }



























  public class CredentialProviderException extends java.lang.Exception {













    ctor public CredentialProviderException(int, @NonNull String, @NonNull Throwable);













    ctor public CredentialProviderException(int, @NonNull String);













    ctor public CredentialProviderException(int, @NonNull Throwable);













    ctor public CredentialProviderException(int);













    method public int getErrorCode();













    field public static final int ERROR_UNKNOWN = 0; // 0x0













  }



























  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.service.credentials.CredentialProviderException>);













    method public abstract void onBeginGetCredentials(@NonNull android.service.credentials.BeginGetCredentialsRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.service.credentials.BeginGetCredentialsResponse,android.service.credentials.CredentialProviderException>);













    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>);













    method public abstract void onBeginGetCredential(@NonNull android.service.credentials.BeginGetCredentialRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.service.credentials.BeginGetCredentialResponse,android.credentials.GetCredentialException>);















    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);















    field public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";















    field public static final String EXTRA_CREATE_CREDENTIAL_EXCEPTION = "android.service.credentials.extra.CREATE_CREDENTIAL_EXCEPTION";










@@ -39679,14 +39670,14 @@ package android.service.credentials {



























  public final class GetCredentialRequest implements android.os.Parcelable {















    method public int describeContents();













    method @NonNull public String getCallingPackage();













    method @NonNull public android.service.credentials.CallingAppInfo getCallingAppInfo();















    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.service.credentials.GetCredentialRequest> CREATOR;















  }





























  public static final class GetCredentialRequest.Builder {













    ctor public GetCredentialRequest.Builder(@NonNull String);













    ctor public GetCredentialRequest.Builder(@NonNull android.service.credentials.CallingAppInfo);















    method @NonNull public android.service.credentials.GetCredentialRequest.Builder addGetCredentialOption(@NonNull android.credentials.GetCredentialOption);















    method @NonNull public android.service.credentials.GetCredentialRequest build();















    method @NonNull public android.service.credentials.GetCredentialRequest.Builder setGetCredentialOptions(@NonNull java.util.List<android.credentials.GetCredentialOption>);

























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -42,7 +42,7 @@ public final class Action implements Parcelable {













     * level authentication before displaying any content etc.















     *















     * <p> See details on usage of {@code Action} for various actionable entries in













     * {@link BeginCreateCredentialResponse} and {@link BeginGetCredentialsResponse}.













     * {@link BeginCreateCredentialResponse} and {@link BeginGetCredentialResponse}.















     *















     * @param slice the display content to be displayed on the UI, along with this action















     * @param pendingIntent the intent to be invoked when the user selects this action

































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



+10
−10




























Original line number
Diff line number
Diff line








@@ -31,28 +31,28 @@ import java.util.Objects;













 * See {@link BeginCreateCredentialResponse} for the counterpart response















 */















public final class BeginCreateCredentialRequest implements Parcelable {













    private final @NonNull String mCallingPackage;













    private final @NonNull CallingAppInfo mCallingAppInfo;















    private final @NonNull String mType;















    private final @NonNull Bundle mData;































    /**















     * Constructs a new instance.















     *













     * @throws IllegalArgumentException If {@code callingPackage}, or {@code type} string is













     * @throws IllegalArgumentException If {@code callingAppInfo}, or {@code type} string is















     * null or empty.















     * @throws NullPointerException If {@code data} is null.















     */













    public BeginCreateCredentialRequest(@NonNull String callingPackage,













    public BeginCreateCredentialRequest(@NonNull CallingAppInfo callingAppInfo,















            @NonNull String type, @NonNull Bundle data) {













        mCallingPackage = Preconditions.checkStringNotEmpty(callingPackage,













                "callingPackage must not be null or empty");













        mCallingAppInfo = Objects.requireNonNull(callingAppInfo,













                "callingAppInfo must not be null");















        mType = Preconditions.checkStringNotEmpty(type,















                "type must not be null or empty");















        mData = Objects.requireNonNull(data, "data must not be null");















    }































    private BeginCreateCredentialRequest(@NonNull Parcel in) {













        mCallingPackage = in.readString8();













        mCallingAppInfo = in.readTypedObject(CallingAppInfo.CREATOR);















        mType = in.readString8();















        mData = in.readBundle(Bundle.class.getClassLoader());















    }









@@ -77,15 +77,15 @@ public final class BeginCreateCredentialRequest implements Parcelable {





























    @Override















    public void writeToParcel(@NonNull Parcel dest, int flags) {













        dest.writeString8(mCallingPackage);













        dest.writeTypedObject(mCallingAppInfo, flags);















        dest.writeString8(mType);















        dest.writeBundle(mData);















    }





























    /** Returns the calling package of the calling app. */













    /** Returns the info pertaining to the calling app. */















    @NonNull













    public String getCallingPackage() {













        return mCallingPackage;













    public CallingAppInfo getCallingAppInfo() {













        return mCallingAppInfo;















    }































    /** Returns the type of the credential to be created. */

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -29,7 +29,7 @@ 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 BeginGetCredentialsResponse}.













 * {@link CredentialEntry} on the {@link BeginGetCredentialResponse}.















 */















public final class BeginGetCredentialOption implements Parcelable {

























@@ -56,7 +56,7 @@ public final class BeginGetCredentialOption implements Parcelable {













    /**















     * Returns the request candidate query data, denoting a set of parameters















     * that can be used to populate a candidate list of credentials, as













     * {@link CredentialEntry} on {@link BeginGetCredentialsResponse}. This list













     * {@link CredentialEntry} on {@link BeginGetCredentialResponse}. This list















     * of entries is then presented to the user on a selector.















     *















     * <p>This data does not contain any sensitive parameters, and will be sent

































core/java/android/service/credentials/BeginGetCredentialsRequest.aidl→core/java/android/service/credentials/BeginGetCredentialRequest.aidl



+1
−1




























Original line number
Diff line number
Diff line















package android.service.credentials;





























parcelable BeginGetCredentialsRequest;










 No newline at end of file












parcelable BeginGetCredentialRequest;










 No newline at end of file