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

Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578

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

Change-Id: Id318cb90a4fe3d364cb91c4a6b3228835860c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guangjie (Jerry) Shi
2023-05-05 18:06:33 +00:00
committed by Automerger Merge Worker
parent d91ec4c6ce 5ea3d20578
commit b9853fd9f4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/credentials/CombinedProviderInfo.java
View File

@@ -51,7 +51,11 @@ public final class CombinedProviderInfo {
@Nullable AutofillServiceInfo asi, @Nullable AutofillServiceInfo asi,
boolean isDefaultAutofillProvider, boolean isDefaultAutofillProvider,
boolean IsPrimaryCredmanProvider) { boolean IsPrimaryCredmanProvider) {
mCredentialProviderInfos = new ArrayList<>(cpis); if (cpis == null) {
mCredentialProviderInfos = new ArrayList<>();
} else {
mCredentialProviderInfos = new ArrayList<>(cpis);
}
mAutofillServiceInfo = asi; mAutofillServiceInfo = asi;
mIsDefaultAutofillProvider = isDefaultAutofillProvider; mIsDefaultAutofillProvider = isDefaultAutofillProvider;
mIsPrimaryCredmanProvider = IsPrimaryCredmanProvider; mIsPrimaryCredmanProvider = IsPrimaryCredmanProvider;
@@ -257,7 +261,7 @@ public final class CombinedProviderInfo {
// Check if we have any enabled cred man services. // Check if we have any enabled cred man services.
boolean isPrimaryCredmanProvider = false; boolean isPrimaryCredmanProvider = false;
if (!cpi.isEmpty()) { if (cpi != null && !cpi.isEmpty()) {
isPrimaryCredmanProvider = cpi.get(0).isPrimary(); isPrimaryCredmanProvider = cpi.get(0).isPrimary();
} }