diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-12-16 01:53:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 01:53:20 +0000 |
| commit | 081d7d5091b9f1c9d2c8c3206d20103a1c048031 (patch) | |
| tree | 03f6103fa490e4415bac8f91f953bf9a541866f9 /core/java/android/content | |
| parent | 306f0eb669a64d0fdadc8923168e7c586bfa5c2a (diff) | |
| parent | 58d66c30d78a70c7bb5d2a62669ed64d6931b777 (diff) | |
| download | frameworks_base-081d7d5091b9f1c9d2c8c3206d20103a1c048031.zip frameworks_base-081d7d5091b9f1c9d2c8c3206d20103a1c048031.tar.gz frameworks_base-081d7d5091b9f1c9d2c8c3206d20103a1c048031.tar.bz2 | |
am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee
* commit '58d66c30d78a70c7bb5d2a62669ed64d6931b777':
Fix NPE in Transport.applyBatch
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; |