Fix NPE in ContactSaveService
Check for null cursors before accessing.
Bug:18504067
Change-Id: I9945adfd45671d296ad64cd57aa4985a94d18144
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index aed0f34..bdd2dd0 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -817,6 +817,9 @@
// 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);
@@ -1005,6 +1008,11 @@
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;