From 9144b4dd853ced7a8e3c28111ee9e152c38ceade Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 26 Sep 2018 20:15:12 -0600
Subject: We still need userIds to be populated.

Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2105d974a5a77f3a38b887c8459d893639fdffa2
---
 core/java/android/content/ContentProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java/android/content/ContentProvider.java')

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 507f5c46e4ac..a64eead04c6f 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -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);
-- 
cgit v1.2.3