diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-12-15 12:28:25 -0800 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-12-15 13:25:52 -0800 |
| commit | ac2506c7e325b4e095405de155480a1abb3c4623 (patch) | |
| tree | 9f8a08745e4230e61f2dc6be7032decaa31c0616 /core/java/android/content | |
| parent | 9973643bfc123fcc73803542ef8cb74e243907ce (diff) | |
| download | frameworks_base-ac2506c7e325b4e095405de155480a1abb3c4623.zip frameworks_base-ac2506c7e325b4e095405de155480a1abb3c4623.tar.gz frameworks_base-ac2506c7e325b4e095405de155480a1abb3c4623.tar.bz2 | |
Fix NPE in Transport.applyBatch
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 10 |
1 files changed, 6 insertions, 4 deletions
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; |