handle the edge case where more than one directory matches an account

In rare cases, Gmail can have multiple directory providers for a single
account. In these cases, the prior code would actually end up *omitting*
all but the last provider it encountered in the final results.

Fix this by only "promoting" the first such matching directory. The
choice to promote the first is arbitrary, but this is strictly better
than the existing code because it no longer omits the other matching
directories.

Bug: 28171393
Change-Id: Ifde3dbc868b0e3d1c6c5520429847cb773a808b2

1 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/ex/chips/BaseRecipientAdapter.java b/src/com/android/ex/chips/BaseRecipientAdapter.java
index 2c394f8..f39b016 100644
--- a/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -746,8 +746,9 @@ public class BaseRecipientAdapter extends BaseAdapter implements Filterable, Acc
             // If an account has been provided and we found a directory that
             // corresponds to that account, place that directory second, directly
             // underneath the local contacts.
-            if (account != null && account.name.equals(params.accountName) &&
-                    account.type.equals(params.accountType)) {
+            if (preferredDirectory == null && account != null
+                    && account.name.equals(params.accountName)
+                    && account.type.equals(params.accountType)) {
                 preferredDirectory = params;
             } else {
                 paramsList.add(params);