commit c7c520ad7774049dd2ab8ccd43bf1c9e375350dc
author Jeff Sharkey <jsharkey@android.com> Wed Sep 26 20:15:12 2018 -0600
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 27 02:33:14 2018 +0000
tree e7828509c35a8e12b1a1d70e90edad98ca134cfc
parent 84b7e126c29bcff329134956a3b468f21b14fa71

We still need userIds to be populated.

Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2105d974a5a77f3a38b887c8459d893639fdffa2
(cherry picked from commit 9144b4dd853ced7a8e3c28111ee9e152c38ceade)

core/java/android/content/ContentProvider.java

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 507f5c4..a64eead 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -331,9 +331,9 @@
             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);