Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dropped "execute" in the CredentialManager api names."

Browse Source
This commit is contained in:
Helen Qin
2023-01-18 18:05:15 +00:00
committed by Android (Google) Code Review
parent 9d3188856b 02fc858161
commit e67c529593
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -13343,8 +13343,8 @@ package android.credentials {
public final class CredentialManager {
method public void clearCredentialState(@NonNull android.credentials.ClearCredentialStateRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.ClearCredentialStateException>);
method public void executeCreateCredential(@NonNull android.credentials.CreateCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.CreateCredentialResponse,android.credentials.CreateCredentialException>);
method public void executeGetCredential(@NonNull android.credentials.GetCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);
method public void createCredential(@NonNull android.credentials.CreateCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.CreateCredentialResponse,android.credentials.CreateCredentialException>);
method public void getCredential(@NonNull android.credentials.GetCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);
}
public class GetCredentialException extends java.lang.Exception {

4
core/java/android/credentials/CreateCredentialException.java
View File

@@ -28,7 +28,7 @@ import java.util.concurrent.Executor;
/**
* Represents an error encountered during the
* {@link CredentialManager#executeCreateCredential(CreateCredentialRequest,
* {@link CredentialManager#createCredential(CreateCredentialRequest,
* Activity, CancellationSignal, Executor, OutcomeReceiver)} operation.
*/
public class CreateCredentialException extends Exception {
@@ -41,7 +41,7 @@ public class CreateCredentialException extends Exception {
/**
* The error type value for when no credential is available for the given {@link
* CredentialManager#executeCreateCredential(CreateCredentialRequest, Activity,
* CredentialManager#createCredential(CreateCredentialRequest, Activity,
* CancellationSignal, Executor, OutcomeReceiver)} request.
*/
@NonNull

10
core/java/android/credentials/CredentialManager.java
View File

@@ -82,7 +82,7 @@ public final class CredentialManager {
* @param executor the callback will take place on this {@link Executor}
* @param callback the callback invoked when the request succeeds or fails
*/
public void executeGetCredential(
public void getCredential(
@NonNull GetCredentialRequest request,
@NonNull Activity activity,
@Nullable CancellationSignal cancellationSignal,
@@ -94,7 +94,7 @@ public final class CredentialManager {
requireNonNull(callback, "callback must not be null");
if (cancellationSignal != null && cancellationSignal.isCanceled()) {
Log.w(TAG, "executeGetCredential already canceled");
Log.w(TAG, "getCredential already canceled");
return;
}
@@ -126,7 +126,7 @@ public final class CredentialManager {
* @param executor the callback will take place on this {@link Executor}
* @param callback the callback invoked when the request succeeds or fails
*/
public void executeCreateCredential(
public void createCredential(
@NonNull CreateCredentialRequest request,
@NonNull Activity activity,
@Nullable CancellationSignal cancellationSignal,
@@ -139,7 +139,7 @@ public final class CredentialManager {
requireNonNull(callback, "callback must not be null");
if (cancellationSignal != null && cancellationSignal.isCanceled()) {
Log.w(TAG, "executeCreateCredential already canceled");
Log.w(TAG, "createCredential already canceled");
return;
}
@@ -185,7 +185,7 @@ public final class CredentialManager {
requireNonNull(callback, "callback must not be null");
if (cancellationSignal != null && cancellationSignal.isCanceled()) {
Log.w(TAG, "executeCreateCredential already canceled");
Log.w(TAG, "clearCredentialState already canceled");
return;
}

4
core/java/android/credentials/GetCredentialException.java
View File

@@ -28,7 +28,7 @@ import java.util.concurrent.Executor;
/**
* Represents an error encountered during the
* {@link CredentialManager#executeGetCredential(GetCredentialRequest,
* {@link CredentialManager#getCredential(GetCredentialRequest,
* Activity, CancellationSignal, Executor, OutcomeReceiver)} operation.
*/
public class GetCredentialException extends Exception {
@@ -41,7 +41,7 @@ public class GetCredentialException extends Exception {
/**
* The error type value for when no credential is found available for the given {@link
* CredentialManager#executeGetCredential(GetCredentialRequest, Activity, CancellationSignal,
* CredentialManager#getCredential(GetCredentialRequest, Activity, CancellationSignal,
* Executor, OutcomeReceiver)} request.
*/
@NonNull

4
core/java/android/credentials/ui/RequestInfo.java
View File

@@ -48,9 +48,9 @@ public final class RequestInfo implements Parcelable {
/** Type value for any request that does not require UI. */
@NonNull public static final String TYPE_UNDEFINED = "android.credentials.ui.TYPE_UNDEFINED";
/** Type value for an executeGetCredential request. */
/** Type value for a getCredential request. */
@NonNull public static final String TYPE_GET = "android.credentials.ui.TYPE_GET";
/** Type value for an executeCreateCredential request. */
/** Type value for a createCredential request. */
@NonNull public static final String TYPE_CREATE = "android.credentials.ui.TYPE_CREATE";
/** @hide */

2
services/credentials/java/com/android/server/credentials/CreateRequestSession.java
View File

@@ -35,7 +35,7 @@ import android.util.Log;
import java.util.ArrayList;
/**
* Central session for a single {@link CredentialManager#executeCreateCredential} request.
* Central session for a single {@link CredentialManager#createCredential} request.
* This class listens to the responses from providers, and the UX app, and updates the
* provider(s) state maintained in {@link ProviderCreateSession}.
*/