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

Merge "Fix bug that filters out system providers" into udc-dev

Browse Source
This commit is contained in:
Reema Bajwa
2023-05-12 20:03:21 +00:00
committed by Android (Google) Code Review
parent cdafea74a5 f7b23ffc4c
commit b23ec97238
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
List<CredentialOption> filteredOptions = new ArrayList<>(); List<CredentialOption> filteredOptions = new ArrayList<>();
for (CredentialOption option : clientRequest.getCredentialOptions()) { for (CredentialOption option : clientRequest.getCredentialOptions()) {
if (providerCapabilities.contains(option.getType()) if (providerCapabilities.contains(option.getType())
&& isProviderAllowed(option, info.getComponentName()) && isProviderAllowed(option, info)
&& checkSystemProviderRequirement(option, info.isSystemProvider())) { && checkSystemProviderRequirement(option, info.isSystemProvider())) {
Slog.i(TAG, "Option of type: " + option.getType() + " meets all filtering" Slog.i(TAG, "Option of type: " + option.getType() + " meets all filtering"
+ "conditions"); + "conditions");
@@ -167,9 +167,14 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential
return null; return null;
} }
private static boolean isProviderAllowed(CredentialOption option, ComponentName componentName) { private static boolean isProviderAllowed(CredentialOption option,
CredentialProviderInfo providerInfo) {
if (providerInfo.isSystemProvider()) {
// Always allow system providers , including the remote provider
return true;
}
if (!option.getAllowedProviders().isEmpty() && !option.getAllowedProviders().contains( if (!option.getAllowedProviders().isEmpty() && !option.getAllowedProviders().contains(
componentName)) { providerInfo.getComponentName())) {
Slog.i(TAG, "Provider allow list specified but does not contain this provider"); Slog.i(TAG, "Provider allow list specified but does not contain this provider");
return false; return false;
} }