Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jay Shrauner
2014-12-15 23:56:52 +00:00
committed by Android (Google) Code Review
parent 0f0e85a689 ac2506c7e3
commit 12b5e504fd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/ContentProvider.java
View File

@@ -286,12 +286,14 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
final String original = setCallingPackage(callingPkg); final String original = setCallingPackage(callingPkg);
try { try {
ContentProviderResult[] results = ContentProvider.this.applyBatch(operations); ContentProviderResult[] results = ContentProvider.this.applyBatch(operations);
if (results != null) {
for (int i = 0; i < results.length ; i++) { for (int i = 0; i < results.length ; i++) {
if (userIds[i] != UserHandle.USER_CURRENT) { if (userIds[i] != UserHandle.USER_CURRENT) {
// Adding the userId to the uri. // Adding the userId to the uri.
results[i] = new ContentProviderResult(results[i], userIds[i]); results[i] = new ContentProviderResult(results[i], userIds[i]);
} }
} }
}
return results; return results;
} finally { } finally {
setCallingPackage(original); setCallingPackage(original);