diff options
author | Jay Shrauner <shrauner@google.com> | 2014-11-24 10:07:31 -0800 |
---|---|---|
committer | Natiq Ahmed <mnatiq@codeaurora.org> | 2015-03-13 13:49:26 +0530 |
commit | 7983b8c10a561fbeec39f4a4c7d455b72230c750 (patch) | |
tree | 183239cf3ae7d3682d37800adb8769d3f36fc086 | |
parent | 22937a21f6932a3fcdd2a20527ee0c2524f41806 (diff) | |
download | packages_apps_Contacts-7983b8c10a561fbeec39f4a4c7d455b72230c750.tar.gz packages_apps_Contacts-7983b8c10a561fbeec39f4a4c7d455b72230c750.tar.bz2 packages_apps_Contacts-7983b8c10a561fbeec39f4a4c7d455b72230c750.zip |
Fix NPE in ContactSaveService
Check for null cursors before accessing.
Bug:18504067
Change-Id: I9945adfd45671d296ad64cd57aa4985a94d18144
-rw-r--r-- | src/com/android/contacts/ContactSaveService.java | 8 |
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; |