Merge "We still need userIds to be populated."
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 8d9533e..507f5c4 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -333,6 +333,7 @@
                 Uri uri = operation.getUri();
                 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);