Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 081d7d50 authored by Jay Shrauner's avatar Jay Shrauner Committed by Android Git Automerger
Browse files

am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into... 

am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee4

* commit '58d66c30':
  Fix NPE in Transport.applyBatch
parents 306f0eb6 58d66c30

core/java/android/content/ContentProvider.java

+6 −4
Original line number Diff line number Diff line
@@ -286,12 +286,14 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            final String original = setCallingPackage(callingPkg);

            try {

                ContentProviderResult[] results = ContentProvider.this.applyBatch(operations);

                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;

            } finally {

                setCallingPackage(original);