commit 568f4e72711908455ccd20fbb04c1017b10d7e1c
author Jay Shrauner <shrauner@google.com> Wed Nov 26 08:16:25 2014 -0800
committer Jay Shrauner <shrauner@google.com> Wed Nov 26 08:16:25 2014 -0800
tree 48cd04e4df8565f1a9af08cc2b6cc9f08ce3f3fc
parent b7627801c884c09172ed41c4b4ea52dacb53fb46

Fix NPE in getInsertedRawContactId

Bug:18532368
Change-Id: I5758ac9c4ce9c95c38b92c0153f7b39bee8e0a98

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bdd2dd0..02a2471 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -514,6 +514,9 @@
     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++) {