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

Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 5e8e9ace78

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

Change-Id: If411aa4ef2cc867e14a4838c7e3c96c568c70885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-10 22:19:54 +00:00
committed by Automerger Merge Worker
parent ae518d8f14 5e8e9ace78
commit 8a36c107a9
2 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,16 +533,9 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
boolean isChecked = pref.isChecked();
if (isChecked) {
if (togglePackageNameEnabled(packageName)) {
// Enable all prefs.
if (mPrefs.containsKey(packageName)) {
mPrefs.get(packageName).setChecked(true);
}
} else {
// Since we failed to show toggle the switch back to off.
pref.setChecked(false);
if (mEnabledPackageNames.size() >= MAX_SELECTABLE_PROVIDERS) {
// Show the error if too many enabled.
pref.setChecked(false);
final DialogFragment fragment = newErrorDialogFragment();
if (fragment == null || mFragmentManager == null) {
@@ -550,8 +543,15 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
}
fragment.show(mFragmentManager, ErrorDialogFragment.TAG);
return true;
}
togglePackageNameEnabled(packageName);
// Enable all prefs.
if (mPrefs.containsKey(packageName)) {
mPrefs.get(packageName).setChecked(true);
}
return true;
} else {
// If we are disabling the last enabled provider then show a warning.