summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/contacts/ContactSaveService.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index c4e3b572d..3c6a6688b 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -1099,6 +1099,9 @@ public class ContactSaveService extends IntentService {
// Undemote the contact if necessary
final Cursor c = getContentResolver().query(contactUri, new String[] {Contacts._ID},
null, null, null);
+ if (c == null) {
+ return;
+ }
try {
if (c.moveToFirst()) {
final long id = c.getLong(0);
@@ -1301,6 +1304,11 @@ public class ContactSaveService extends IntentService {
JoinContactQuery.PROJECTION,
JoinContactQuery.SELECTION,
new String[]{String.valueOf(contactId1), String.valueOf(contactId2)}, null);
+ if (c == null) {
+ Log.e(TAG, "Unable to open Contacts DB cursor");
+ showToast(R.string.contactSavedErrorToast);
+ return;
+ }
long rawContactIds[];
long verifiedNameRawContactId = -1;