commit 37bdd85f75878e0a563fba17e38a82f125ebb474
author Yu Ping Hu <yph@google.com> Thu Nov 07 00:36:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 07 00:36:18 2013 +0000
tree c927ae863a77a4b23eae25ba9c9031688d835942
parent 10794fb0425a4cd31c1c7fa7fc85964aac677946
parent 8999766c3798c606840477abd203fc02fb55aa13

Merge "Fix Exchange directory lookup for phone queries." into jb-ub-mail-ur10

src/com/android/exchange/provider/ExchangeDirectoryProvider.java

diff --git a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index 9f04a95..6eea16e 100644
--- a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
@@ -474,6 +474,12 @@
                 row[contactIdIndex] = contactId;
             }
 
+            if (lookupIndex != -1) {
+                // We use the packed string as our lookup key; it contains ALL of the gal data
+                // We do this because we are not able to provide a stable id to ContactsProvider
+                row[lookupIndex] = Uri.encode(galDataRow.toPackedString());
+            }
+
             if (isPhoneFilter) {
                 final Set<String> uniqueNumbers = new HashSet<String>();
 
@@ -505,11 +511,6 @@
                 if (idIndex != -1) {
                     row[idIndex] = id;
                 }
-                if (lookupIndex != -1) {
-                    // We use the packed string as our lookup key; it contains ALL of the gal data
-                    // We do this because we are not able to provide a stable id to ContactsProvider
-                    row[lookupIndex] = Uri.encode(galDataRow.toPackedString());
-                }
                 sortedResultsMap.put(new GalSortKey(sortName, id), row.clone());
                 id++;
             }
@@ -524,7 +525,7 @@
     }
 
     private void addPhoneInfo(List<PhoneInfo> phones, String number, int type) {
-        if (number != null) {
+        if (!TextUtils.isEmpty(number)) {
             phones.add(new PhoneInfo(number, type));
         }
     }