commit e320c0bcd539f9426db9b694147e845fe0e2d59d
author Jay Shrauner <shrauner@google.com> Thu Mar 05 12:45:18 2015 -0800
committer Jay Shrauner <shrauner@google.com> Fri Mar 13 14:58:43 2015 -0700
tree 5d072c4fd3648da565722ebc6ddab37eef755d54
parent ebfe75beec08f30b89de7e7251f4106a680f9ab3

Check for empty contact lookup keys

Bug:19588470
Change-Id: I1b0b262483a316a0a84a051e2a4225c68523e47e

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 266ea46..4c3671f 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -387,6 +387,9 @@
                     Cursor c = resolver.query(Profile.CONTENT_URI,
                             new String[] {Contacts._ID, Contacts.LOOKUP_KEY},
                             null, null, null);
+                    if (c == null) {
+                        continue;
+                    }
                     try {
                         if (c.moveToFirst()) {
                             final long contactId = c.getLong(0);
@@ -401,7 +404,9 @@
                                     rawContactId);
                     lookupUri = RawContacts.getContactLookupUri(resolver, rawContactUri);
                 }
-                Log.v(TAG, "Saved contact. New URI: " + lookupUri);
+                if (lookupUri != null) {
+                    Log.v(TAG, "Saved contact. New URI: " + lookupUri);
+                }
 
                 // We can change this back to false later, if we fail to save the contact photo.
                 succeeded = true;