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

Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: b3b562cd34

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

Change-Id: I8b81873853261b242fc02df9dc48c466b5401295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guangjie (Jerry) Shi
2023-05-04 18:14:25 +00:00
committed by Automerger Merge Worker
parent f8770a9d56 b3b562cd34
commit b3b3342c89
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,6 +562,7 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
List<String> enabledServices = getEnabledSettings(); List<String> enabledServices = getEnabledSettings();
mCredentialManager.setEnabledProviders( mCredentialManager.setEnabledProviders(
new ArrayList<String>(), // TODO(240466271): pass down primary providers
enabledServices, enabledServices,
getUser(), getUser(),
mExecutor, mExecutor,

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

@@ -356,6 +356,7 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
} }
service.setEnabledProviders( service.setEnabledProviders(
new ArrayList<String>(), // TODO(240466271): pass down primary providers.
credManProviders, credManProviders,
mUserId, mUserId,
ContextCompat.getMainExecutor(getContext()), ContextCompat.getMainExecutor(getContext()),