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

Merge "Add sessions to requestsession" into udc-dev

Browse Source
This commit is contained in:
Omer Ozer
2023-03-10 17:03:52 +00:00
committed by Android (Google) Code Review
parent eea97a6ad7 094fa9109e
commit 4b2b7800ec
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/credentials/java/com/android/server/credentials/CredentialDescriptionRegistry.java
View File

@@ -221,12 +221,12 @@ public class CredentialDescriptionRegistry {
return false;
}
private static boolean checkForMatch(Set<String> registeredUnflattenedStrings,
static boolean checkForMatch(Set<String> registeredUnflattenedStrings,
Set<String> requestedUnflattenedString) {
return registeredUnflattenedStrings.containsAll(requestedUnflattenedString);
}
private static Set<String> flatStringToSet(String flatString) {
static Set<String> flatStringToSet(String flatString) {
return new HashSet<>(Arrays
.asList(flatString.split(FLAT_STRING_SPLIT_REGEX)));
}

28
services/credentials/java/com/android/server/credentials/CredentialManagerService.java
View File

@@ -291,14 +291,15 @@ public final class CredentialManagerService
List<ProviderSession> providerSessions = new ArrayList<>();
for (Pair<CredentialOption, CredentialDescriptionRegistry.FilterResult> result :
activeCredentialContainers) {
providerSessions.add(
ProviderRegistryGetSession.createNewSession(
mContext,
UserHandle.getCallingUserId(),
session,
session.mClientAppInfo,
result.second.mPackageName,
result.first));
ProviderSession providerSession = ProviderRegistryGetSession.createNewSession(
mContext,
UserHandle.getCallingUserId(),
session,
session.mClientAppInfo,
result.second.mPackageName,
result.first);
providerSessions.add(providerSession);
session.addProviderSession(providerSession.getComponentName(), providerSession);
}
return providerSessions;
}
@@ -328,10 +329,15 @@ public final class CredentialManagerService
new HashSet<>();
for (CredentialDescriptionRegistry.FilterResult filterResult : filterResults) {
Set<String> registeredUnflattenedStrings = CredentialDescriptionRegistry
.flatStringToSet(filterResult.mFlattenedRequest);
for (CredentialOption credentialOption : options) {
if (filterResult.mFlattenedRequest.equals(credentialOption
.getCredentialRetrievalData()
.getString(CredentialOption.FLATTENED_REQUEST))) {
Set<String> requestedUnflattenedStrings = CredentialDescriptionRegistry
.flatStringToSet(credentialOption
.getCredentialRetrievalData()
.getString(CredentialOption.FLATTENED_REQUEST));
if (CredentialDescriptionRegistry.checkForMatch(registeredUnflattenedStrings,
requestedUnflattenedStrings)) {
result.add(new Pair<>(credentialOption, filterResult));
}
}

4
services/credentials/java/com/android/server/credentials/RequestSession.java
View File

@@ -128,6 +128,10 @@ abstract class RequestSession<T, U> implements CredentialManagerUi.CredentialMan
this.mInitialPhaseMetric.setCountRequestClassType(requestClassType);
}
public void addProviderSession(ComponentName componentName, ProviderSession providerSession) {
mProviders.put(componentName.flattenToString(), providerSession);
}
// UI callbacks
@Override // from CredentialManagerUiCallbacks