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

Commit 78478b13 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "We still need userIds to be populated."

parents 7a0a1176 9144b4dd
Loading
Loading
Loading
Loading
+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);