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

Commit 58d66c30 authored by Jay Shrauner's avatar Jay Shrauner Committed by android-build-merger
Browse files

am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 

automerge: 59e96ee4

* commit '59e96ee4':
  Fix NPE in Transport.applyBatch
parents 22bfb75e 59e96ee4

core/java/android/content/ContentProvider.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -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);