PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use isPrimary bit when determining settings data change" into main

Browse Source
This commit is contained in:
Becca Hughes
2023-09-19 22:08:30 +00:00
committed by Android (Google) Code Review
parent ba14b4b5c2 0335c2281a
commit dce410276c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -317,10 +317,15 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
null); null);
} }
private Set<ComponentName> buildComponentNameSet(List<CredentialProviderInfo> providers) { private Set<ComponentName> buildComponentNameSet(
List<CredentialProviderInfo> providers, boolean removeNonPrimary) {
Set<ComponentName> output = new HashSet<>(); Set<ComponentName> output = new HashSet<>();
for (CredentialProviderInfo cpi : providers) { for (CredentialProviderInfo cpi : providers) {
if (removeNonPrimary && !cpi.isPrimary()) {
continue;
}
output.add(cpi.getComponentName()); output.add(cpi.getComponentName());
} }
@@ -336,13 +341,16 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
List<CredentialProviderInfo> newProviders = List<CredentialProviderInfo> newProviders =
mCredentialManager.getCredentialProviderServices( mCredentialManager.getCredentialProviderServices(
getUser(), CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY); getUser(), CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY);
Set<ComponentName> newComponents = buildComponentNameSet(newProviders); Set<ComponentName> newComponents = buildComponentNameSet(newProviders, false);
Set<ComponentName> newPrimaryComponents = buildComponentNameSet(newProviders, true);
// Get the list of old components // Get the list of old components
Set<ComponentName> oldComponents = buildComponentNameSet(mServices); Set<ComponentName> oldComponents = buildComponentNameSet(mServices, false);
Set<ComponentName> oldPrimaryComponents = buildComponentNameSet(mServices, true);
// If the sets are equal then don't update the UI. // If the sets are equal then don't update the UI.
if (oldComponents.equals(newComponents)) { if (oldComponents.equals(newComponents)
&& oldPrimaryComponents.equals(newPrimaryComponents)) {
return; return;
} }