commit 3d7edc3ef4f2521639bae91c93a8238e5a9509c1
author Jay Shrauner <shrauner@google.com> Mon Nov 10 09:58:23 2014 -0800
committer Jay Shrauner <shrauner@google.com> Mon Nov 10 09:58:23 2014 -0800
tree 31bf7fae34504ab2974aa4c11e5a6e16c22adfdb
parent fc2ad4fa3ea7a947b693b635ae3aa51e64568095

Fix ArrayIndexOutOfBoundsException crash

Bug:18305135
Change-Id: I8a562bebb217d278c84662b5057e786e62ce8a3f

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bb03705..aed0f34 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -515,7 +515,8 @@
             final ArrayList<ContentProviderOperation> diff,
             final ContentProviderResult[] results) {
         final int diffSize = diff.size();
-        for (int i = 0; i < diffSize; i++) {
+        final int numResults = results.length;
+        for (int i = 0; i < diffSize && i < numResults; i++) {
             ContentProviderOperation operation = diff.get(i);
             if (operation.getType() == ContentProviderOperation.TYPE_INSERT
                     && operation.getUri().getEncodedPath().contains(