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

Commit 9144b4dd authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

We still need userIds to be populated. 

Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2105d974a5a77f3a38b887c8459d893639fdffa2
parent 66768ba6

core/java/android/content/ContentProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -331,9 +331,9 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            for (int i = 0; i < numOperations; i++) {

                ContentProviderOperation operation = operations.get(i);

                Uri uri = operation.getUri();

                userIds[i] = getUserIdFromUri(uri);

                uri = validateIncomingUri(uri);

                uri = maybeGetUriWithoutUserId(uri);

                userIds[i] = getUserIdFromUri(uri);

                // Rebuild operation if we changed the Uri above

                if (!Objects.equals(operation.getUri(), uri)) {

                    operation = new ContentProviderOperation(operation, uri);