commit 84b7e126c29bcff329134956a3b468f21b14fa71
author Jeff Sharkey <jsharkey@android.com> Wed Sep 26 20:13:02 2018 -0600
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 27 02:33:09 2018 +0000
tree 387b060a1a6be0fa1404965a277cc7131e37c6d2
parent 2cecea1723b515ecf1da1fd37960d19c9f1503f6

We still need userIds to be populated.

Fixes regression from recent security patch.

Bug: 116685315
Test: none
Change-Id: I2c2e3976ec7ec2b03ebee052ca8ce11b8f66495d
(cherry picked from commit 66768ba66499b9e079a7188c2cd4410a3aa2750b)

core/java/android/content/ContentProvider.java

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);