commit c6cf95c0f5f7250c65e40c441fe58d8cbfd114c9
author Nicolas Prevot <nprevot@google.com> Thu May 29 11:30:36 2014 +0100
committer Nicolas Prevot <nprevot@google.com> Thu May 29 11:30:36 2014 +0100
tree 9c44beaf05c33b7224c4a9a25e08ae52d8fa320e
parent 29fae7b39447977c4247bb901721df86d8a92ef8

Making the content resolver work with result intents.

prepareToLeaveUser is called if necessary on result intents.
Adding the targetUserId to grantUriPermissionFromIntentLocked
This allows the GET_CONTENT intent to work across profiles.

Change-Id: Id81280c23247aeda7ad56e34af9b12a6f3a00a3c

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 92f41f7..29a1708 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1930,7 +1930,7 @@
         }
 
         mService.grantUriPermissionFromIntentLocked(callingUid, r.packageName,
-                intent, r.getUriPermissionsLocked());
+                intent, r.getUriPermissionsLocked(), r.userId);
 
         if (newTask) {
             EventLog.writeEvent(EventLogTags.AM_CREATE_TASK, r.userId, r.task.taskId);