From ac2506c7e325b4e095405de155480a1abb3c4623 Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Mon, 15 Dec 2014 12:28:25 -0800 Subject: Fix NPE in Transport.applyBatch Bug:18756774 Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669 --- core/java/android/content/ContentProvider.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core/java/android/content') diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 360f308..0cff4c0 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -286,10 +286,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 { final String original = setCallingPackage(callingPkg); try { ContentProviderResult[] results = ContentProvider.this.applyBatch(operations); - for (int i = 0; i < results.length ; i++) { - if (userIds[i] != UserHandle.USER_CURRENT) { - // Adding the userId to the uri. - results[i] = new ContentProviderResult(results[i], userIds[i]); + if (results != null) { + for (int i = 0; i < results.length ; i++) { + if (userIds[i] != UserHandle.USER_CURRENT) { + // Adding the userId to the uri. + results[i] = new ContentProviderResult(results[i], userIds[i]); + } } } return results; -- cgit v1.1