summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-11-26 08:16:25 -0800
committerNatiq Ahmed <mnatiq@codeaurora.org>2015-03-13 13:51:00 +0530
commit925e6fa2d0ad1a930708c9da3ca3e20ebf5c5c64 (patch)
tree177502bdca8c14cb0cb1660fa3f4721be618278c
parent88163be6ff8285f5358a3fbdf25e30dfe6b35148 (diff)
downloadpackages_apps_Contacts-925e6fa2d0ad1a930708c9da3ca3e20ebf5c5c64.tar.gz
packages_apps_Contacts-925e6fa2d0ad1a930708c9da3ca3e20ebf5c5c64.tar.bz2
packages_apps_Contacts-925e6fa2d0ad1a930708c9da3ca3e20ebf5c5c64.zip
Fix NPE in getInsertedRawContactId
Bug:18532368 Change-Id: I5758ac9c4ce9c95c38b92c0153f7b39bee8e0a98
-rw-r--r--src/com/android/contacts/ContactSaveService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 3c6a6688b..1010af4dd 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -796,6 +796,9 @@ public class ContactSaveService extends IntentService {
private long getInsertedRawContactId(
final ArrayList<ContentProviderOperation> diff,
final ContentProviderResult[] results) {
+ if (results == null) {
+ return -1;
+ }
final int diffSize = diff.size();
final int numResults = results.length;
for (int i = 0; i < diffSize && i < numResults; i++) {