Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5
am: 25115c82a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304 Change-Id: I1f229d25bd137ffe82bc47611c293d627e1c55fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -364,7 +364,7 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
|
|||||||
service.getCredentialProviderServices(
|
service.getCredentialProviderServices(
|
||||||
mUserId, CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY)) {
|
mUserId, CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY)) {
|
||||||
|
|
||||||
if (cpi.isEnabled()) {
|
if (cpi.isEnabled() && !cpi.isPrimary()) {
|
||||||
credManProviders.add(cpi.getServiceInfo().getComponentName().flattenToString());
|
credManProviders.add(cpi.getServiceInfo().getComponentName().flattenToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user