Merge "Set primary services as enabled" into udc-dev (1dc52d15) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java

+5 −2

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

		mCredentialManager.setEnabledProviders(
		new ArrayList<>(primaryServices),
		getEnabledSettings(),
		enabledServices,
		getUser(),
		mExecutor,
		new OutcomeReceiver<Void, SetEnabledProvidersException>() {

+2 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,8 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
		}
		}

		credManProviders.addAll(primaryCredManProviders);

		service.setEnabledProviders(
		primaryCredManProviders,
		credManProviders,