commit 107f7b7becdb5fe6d735a4f1355eb3421f068fb0
author Nicolas Prevot <nprevot@google.com> Wed Jul 01 16:31:48 2015 +0100
committer Nicolas Prevot <nprevot@google.com> Wed Jul 01 17:05:18 2015 +0100
tree 7ea368ade9a9337154b521d29de5255b64f850b8
parent e40d7a632668a3813a443195ba8e2146407a0517

Fix the case where an intent bounces several times between users.

An intent may bounce several times between users.
In this case, we want mContentUserHint to refer to the original
user.

BUG:19656340
Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 0714d36..8c3a950 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2829,7 +2829,7 @@
                     + " res=" + resultCode + " data=" + resultData);
             if (resultTo.userId != r.userId) {
                 if (resultData != null) {
-                    resultData.setContentUserHint(r.userId);
+                    resultData.prepareToLeaveUser(r.userId);
                 }
             }
             if (r.info.applicationInfo.uid > 0) {