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

Merge "Sync action entry selection behavior with credential entry" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-28 19:26:36 +00:00
committed by Android (Google) Code Review
parent 41b6bc55c7 4236dc68c2
commit 51aa1772cb
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/credentials/java/com/android/server/credentials/ProviderGetSession.java
View File

@@ -415,25 +415,8 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
/** Returns true if either an exception or a response is found. */ /** Returns true if either an exception or a response is found. */
private void onActionEntrySelected(ProviderPendingIntentResponse private void onActionEntrySelected(ProviderPendingIntentResponse
providerPendingIntentResponse) { providerPendingIntentResponse) {
// Action entry is expected to either contain the final GetCredentialResponse, or it is Log.i(TAG, "onActionEntrySelected");
// also acceptable if it does not contain anything. In the second case, we re-show this onCredentialEntrySelected(providerPendingIntentResponse);
// action on the UI.
if (providerPendingIntentResponse == null) {
Log.i(TAG, "providerPendingIntentResponse is null");
return;
}
GetCredentialException exception = maybeGetPendingIntentException(
providerPendingIntentResponse);
if (exception != null) {
invokeCallbackWithError(exception.getType(), exception.getMessage());
}
GetCredentialResponse response = PendingIntentResultHandler
.extractGetCredentialResponse(
providerPendingIntentResponse.getResultData());
if (response != null) {
mCallbacks.onFinalResponseReceived(mComponentName, response);
}
} }
@@ -450,11 +433,11 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
/** /**
* When an invalid state occurs, e.g. entry mismatch or no response from provider, * When an invalid state occurs, e.g. entry mismatch or no response from provider,
* we send back a TYPE_UNKNOWN error as to the developer. * we send back a TYPE_NO_CREDENTIAL error as to the developer.
*/ */
private void invokeCallbackOnInternalInvalidState() { private void invokeCallbackOnInternalInvalidState() {
mCallbacks.onFinalErrorReceived(mComponentName, mCallbacks.onFinalErrorReceived(mComponentName,
GetCredentialException.TYPE_UNKNOWN, null); GetCredentialException.TYPE_NO_CREDENTIAL, null);
} }
/** Update auth entries status based on an auth entry selected from a different session. */ /** Update auth entries status based on an auth entry selected from a different session. */