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

Commit ac6cd614 authored by Omer Ozer's avatar Omer Ozer Committed by Android (Google) Code Review
Browse files

Merge "Add CredentialDescription TestAPI for CTS."

parents cf6a5dec d9d9eefa

core/api/test-current.txt

+53 −0
Original line number Diff line number Diff line
@@ -975,6 +975,59 @@ package android.content.rollback { 


}



package android.credentials {



  public final class CredentialDescription implements android.os.Parcelable {

    ctor public CredentialDescription(@NonNull String, @NonNull String, @NonNull java.util.List<android.service.credentials.CredentialEntry>);

    method public int describeContents();

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

    method @NonNull public String getFlattenedRequestString();

    method @NonNull public String getType();

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

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

  }



  public final class CredentialManager {

    method public void registerCredentialDescription(@NonNull android.credentials.RegisterCredentialDescriptionRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.RegisterCredentialDescriptionException>);

    method public void unRegisterCredentialDescription(@NonNull android.credentials.UnregisterCredentialDescriptionRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.UnregisterCredentialDescriptionException>);

  }



  public class RegisterCredentialDescriptionException extends java.lang.Exception {

    ctor public RegisterCredentialDescriptionException(@NonNull String, @Nullable String);

    ctor public RegisterCredentialDescriptionException(@NonNull String, @Nullable String, @Nullable Throwable);

    ctor public RegisterCredentialDescriptionException(@NonNull String, @Nullable Throwable);

    ctor public RegisterCredentialDescriptionException(@NonNull String);

    field @NonNull public final String errorType;

  }



  public final class RegisterCredentialDescriptionRequest implements android.os.Parcelable {

    ctor public RegisterCredentialDescriptionRequest(@NonNull android.credentials.CredentialDescription);

    ctor public RegisterCredentialDescriptionRequest(@NonNull java.util.List<android.credentials.CredentialDescription>);

    method public int describeContents();

    method @NonNull public java.util.List<android.credentials.CredentialDescription> getCredentialDescriptions();

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

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

    field public static final String FLATTENED_REQUEST_STRING_KEY = "flattened_request_string";

  }



  public class UnregisterCredentialDescriptionException extends java.lang.Exception {

    ctor public UnregisterCredentialDescriptionException(@NonNull String, @Nullable String);

    ctor public UnregisterCredentialDescriptionException(@NonNull String, @Nullable String, @Nullable Throwable);

    ctor public UnregisterCredentialDescriptionException(@NonNull String, @Nullable Throwable);

    ctor public UnregisterCredentialDescriptionException(@NonNull String);

    field @NonNull public final String errorType;

  }



  public final class UnregisterCredentialDescriptionRequest implements android.os.Parcelable {

    ctor public UnregisterCredentialDescriptionRequest(@NonNull android.credentials.CredentialDescription);

    method public int describeContents();

    method @NonNull public android.credentials.CredentialDescription getCredentialDescription();

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

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

  }



}



package android.credentials.ui {



  public final class CreateCredentialProviderData extends android.credentials.ui.ProviderData implements android.os.Parcelable {

core/java/android/credentials/CredentialDescription.java

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



import android.annotation.NonNull;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.service.credentials.CredentialEntry;
@@ -32,6 +33,7 @@ import java.util.Objects; 
 * Represents the type and contained data fields of a {@link Credential}.

 * @hide

 */

@TestApi

public final class CredentialDescription implements Parcelable {



    /**

core/java/android/credentials/CredentialManager.java

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.Activity;

import android.app.PendingIntent;

import android.content.Context;
@@ -329,6 +330,7 @@ public final class CredentialManager { 
     *

     * @hide

     */

    @TestApi

    public void registerCredentialDescription(

            @NonNull RegisterCredentialDescriptionRequest request,

            @Nullable CancellationSignal cancellationSignal,
@@ -376,6 +378,7 @@ public final class CredentialManager { 
     *

     * @hide

     */

    @TestApi

    public void unRegisterCredentialDescription(

            @NonNull UnregisterCredentialDescriptionRequest request,

            @Nullable CancellationSignal cancellationSignal,

core/java/android/credentials/RegisterCredentialDescriptionException.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.credentials; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.CancellationSignal;

import android.os.OutcomeReceiver;
@@ -32,6 +33,7 @@ import java.util.concurrent.Executor; 
 *

 * @hide

 */

@TestApi

public class RegisterCredentialDescriptionException extends Exception {



    @NonNull public final String errorType;

core/java/android/credentials/RegisterCredentialDescriptionRequest.java

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



import android.annotation.NonNull;

import android.annotation.TestApi;

import android.content.ComponentName;

import android.os.Parcel;

import android.os.Parcelable;
@@ -36,6 +37,7 @@ import java.util.List; 
 *

 * @hide

 */

@TestApi

public final class RegisterCredentialDescriptionRequest implements Parcelable {



    public static final String FLATTENED_REQUEST_STRING_KEY = "flattened_request_string";