commit 22bdb07ecd1b5d5afd70ee76403fa652dd71ac5e
author Helen Qin <helenqin@google.com> Wed Feb 08 02:02:43 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 08 02:02:43 2023 +0000
tree 6ec745a1cad02102bf6010b0a8b95f6d7ec349ef
parent 842c1a00740bb99fee1d6c17e76f550208c85958
parent 6c10afbf80e09619938da4d527bf664dd7bc9de3

Merge "Fix the auth entry marshalling error."

core/java/android/credentials/ui/GetCredentialProviderData.java

diff --git a/core/java/android/credentials/ui/GetCredentialProviderData.java b/core/java/android/credentials/ui/GetCredentialProviderData.java
index f106ed5..c44d1dd 100644
--- a/core/java/android/credentials/ui/GetCredentialProviderData.java
+++ b/core/java/android/credentials/ui/GetCredentialProviderData.java
@@ -38,7 +38,7 @@
     private final List<Entry> mCredentialEntries;
     @NonNull
     private final List<Entry> mActionChips;
-    @Nullable
+    @NonNull
     private final List<Entry> mAuthenticationEntries;
     @Nullable
     private final Entry mRemoteEntry;
@@ -89,7 +89,7 @@
 
         List<Entry> 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 @@
         @NonNull private String mProviderFlattenedComponentName;
         @NonNull private List<Entry> mCredentialEntries = new ArrayList<>();
         @NonNull private List<Entry> mActionChips = new ArrayList<>();
-        @Nullable private List<Entry> mAuthenticationEntries = new ArrayList<>();
+        @NonNull private List<Entry> mAuthenticationEntries = new ArrayList<>();
         @Nullable private Entry mRemoteEntry = null;
 
         /** Constructor with required properties. */