commit 42129745337d0e27945ad2c013c5df3e10d42d68
author Dmitri Plotnikov <dplotnikov@google.com> Mon Aug 10 10:34:54 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Aug 10 10:34:54 2009 -0700
tree 3f3b02eeec3d5c4aaa7a79534dabf3fbb589cd8e
parent 99a9b5ec879f6cd6876f7f6b680b82d8304e6b92

Minor bug fix: NPE on missing phone number, email or nickname

src/com/android/providers/contacts/ContactAggregator.java

diff --git a/src/com/android/providers/contacts/ContactAggregator.java b/src/com/android/providers/contacts/ContactAggregator.java
index cdf54dc..2be5073 100644
--- a/src/com/android/providers/contacts/ContactAggregator.java
+++ b/src/com/android/providers/contacts/ContactAggregator.java
@@ -554,13 +554,19 @@
                 if (mimeType.equals(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)) {
                     addMatchCandidatesStructuredName(data1, data2, mode, candidates);
                 } else if (mimeType.equals(CommonDataKinds.Email.CONTENT_ITEM_TYPE)) {
-                    addMatchCandidatesEmail(data2, mode, candidates);
-                    lookupEmailMatches(db, data2, matcher);
+                    if (!TextUtils.isEmpty(data2)) {
+                        addMatchCandidatesEmail(data2, mode, candidates);
+                        lookupEmailMatches(db, data2, matcher);
+                    }
                 } else if (mimeType.equals(CommonDataKinds.Phone.CONTENT_ITEM_TYPE)) {
-                    lookupPhoneMatches(db, data2, matcher);
+                    if (!TextUtils.isEmpty(data2)) {
+                        lookupPhoneMatches(db, data2, matcher);
+                    }
                 } else if (mimeType.equals(CommonDataKinds.Nickname.CONTENT_ITEM_TYPE)) {
-                    addMatchCandidatesNickname(data2, mode, candidates);
-                    lookupNicknameMatches(db, data2, matcher);
+                    if (!TextUtils.isEmpty(data2)) {
+                        addMatchCandidatesNickname(data2, mode, candidates);
+                        lookupNicknameMatches(db, data2, matcher);
+                    }
                 }
             }
         } finally {