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

Hide auth entry if there are no credentials retrieved from it

Browse Source 
Test: Built & deployed locally
Bug: 265304287

Change-Id: Ie53f00320e7ff6f41d2ff826cb2258d5f70e567f
This commit is contained in:
Reema Bajwa
2023-01-12 19:39:15 +00:00
parent 59bce679c5
commit 1e875ddba2
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,6 +375,11 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
private void onAuthenticationEntrySelected(
@Nullable ProviderPendingIntentResponse providerPendingIntentResponse) {
//TODO: Other provider intent statuses
if (providerPendingIntentResponse == null) {
Log.i(TAG, "providerPendingIntentResponse is null");
onUpdateEmptyResponse();
}
GetCredentialException exception = maybeGetPendingIntentException(
providerPendingIntentResponse);
if (exception != null) {
@@ -393,7 +398,7 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
}
Log.i(TAG, "No error or respond found in pending intent response");
invokeCallbackOnInternalInvalidState();
onUpdateEmptyResponse();
}
private void onActionEntrySelected(ProviderPendingIntentResponse
@@ -415,12 +420,16 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
}
}
private void onUpdateEmptyResponse() {
updateStatusAndInvokeCallback(Status.NO_CREDENTIALS);
}
@Nullable
private GetCredentialException maybeGetPendingIntentException(
ProviderPendingIntentResponse pendingIntentResponse) {
if (pendingIntentResponse == null) {
Log.i(TAG, "pendingIntentResponse is null");
return new GetCredentialException(GetCredentialException.TYPE_NO_CREDENTIAL);
return null;
}
if (PendingIntentResultHandler.isValidResponse(pendingIntentResponse)) {
GetCredentialException exception = PendingIntentResultHandler

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

@@ -133,7 +133,7 @@ public abstract class ProviderSession<T, R>
PENDING_INTENT_INVOKED,
CREDENTIAL_RECEIVED_FROM_SELECTION,
SAVE_ENTRIES_RECEIVED, CANCELED,
COMPLETE
NO_CREDENTIALS, COMPLETE
}
/** Converts exception to a provider session status. */