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

Commit ac2506c7 authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE in Transport.applyBatch

Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
parent 9973643b
Loading
Loading
Loading
Loading
+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);