From 7983b8c10a561fbeec39f4a4c7d455b72230c750 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Mon, 24 Nov 2014 10:07:31 -0800
Subject: Fix NPE in ContactSaveService

Check for null cursors before accessing.

Bug:18504067
Change-Id: I9945adfd45671d296ad64cd57aa4985a94d18144
---
 src/com/android/contacts/ContactSaveService.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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;
-- 
cgit v1.2.3