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

Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b91facbb79

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ia4158d64795d0f9060ae2984d3de6fa1b1ff870e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-06 00:15:24 +00:00
committed by Automerger Merge Worker
parent 67b23f5ec9 b91facbb79
commit e8873adcce
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,15 +566,18 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
// Get the existing primary providers since we don't touch them in // Get the existing primary providers since we don't touch them in
// this part of the UI we should just copy them over. // this part of the UI we should just copy them over.
Set<String> primaryServices = new HashSet<>(); Set<String> primaryServices = new HashSet<>();
List<String> enabledServices = getEnabledSettings();
for (CredentialProviderInfo service : mServices) { for (CredentialProviderInfo service : mServices) {
if (service.isPrimary()) { if (service.isPrimary()) {
primaryServices.add(service.getServiceInfo().getComponentName().flattenToString()); String flattened = service.getServiceInfo().getComponentName().flattenToString();
primaryServices.add(flattened);
enabledServices.add(flattened);
} }
} }
mCredentialManager.setEnabledProviders( mCredentialManager.setEnabledProviders(
new ArrayList<>(primaryServices), new ArrayList<>(primaryServices),
getEnabledSettings(), enabledServices,
getUser(), getUser(),
mExecutor, mExecutor,
new OutcomeReceiver<Void, SetEnabledProvidersException>() { new OutcomeReceiver<Void, SetEnabledProvidersException>() {

2
src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
View File

@@ -369,6 +369,8 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
} }
} }
credManProviders.addAll(primaryCredManProviders);
service.setEnabledProviders( service.setEnabledProviders(
primaryCredManProviders, primaryCredManProviders,
credManProviders, credManProviders,