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

Browse Source
This commit is contained in:
Guangjie (Jerry) Shi
2023-05-05 16:45:37 +00:00
committed by Android (Google) Code Review
parent 5b18837a49 8d167d55f3
commit 2898e3b527
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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) {
if (cpis == null) {
mCredentialProviderInfos = new ArrayList<>();
} else {
mCredentialProviderInfos = new ArrayList<>(cpis); 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();
} }