From 6c10afbf80e09619938da4d527bf664dd7bc9de3 Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Wed, 8 Feb 2023 00:32:55 +0000 Subject: [PATCH] Fix the auth entry marshalling error. This is the cause that auth entries are not showing up on UX. Bug: 268208819 Test: manual Change-Id: Id4e05b33562ace6a1512d6279526778450298d9c --- .../android/credentials/ui/GetCredentialProviderData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/credentials/ui/GetCredentialProviderData.java b/core/java/android/credentials/ui/GetCredentialProviderData.java index f106ed54c477a..c44d1dd76fe4a 100644 --- a/core/java/android/credentials/ui/GetCredentialProviderData.java +++ b/core/java/android/credentials/ui/GetCredentialProviderData.java @@ -38,7 +38,7 @@ public final class GetCredentialProviderData extends ProviderData implements Par private final List mCredentialEntries; @NonNull private final List mActionChips; - @Nullable + @NonNull private final List mAuthenticationEntries; @Nullable private final Entry mRemoteEntry; @@ -89,7 +89,7 @@ public final class GetCredentialProviderData extends ProviderData implements Par List authenticationEntries = new ArrayList<>(); in.readTypedList(authenticationEntries, Entry.CREATOR); - mAuthenticationEntries = actionChips; + mAuthenticationEntries = authenticationEntries; AnnotationValidations.validate(NonNull.class, null, mAuthenticationEntries); Entry remoteEntry = in.readTypedObject(Entry.CREATOR); @@ -133,7 +133,7 @@ public final class GetCredentialProviderData extends ProviderData implements Par @NonNull private String mProviderFlattenedComponentName; @NonNull private List mCredentialEntries = new ArrayList<>(); @NonNull private List mActionChips = new ArrayList<>(); - @Nullable private List mAuthenticationEntries = new ArrayList<>(); + @NonNull private List mAuthenticationEntries = new ArrayList<>(); @Nullable private Entry mRemoteEntry = null; /** Constructor with required properties. */