Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev

Browse Source 
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
  Fix the case where an intent bounces several times between users.
This commit is contained in:
Nicolas Prevot
2015-07-02 10:52:25 +00:00
committed by Android Git Automerger
parent c3ab1714ad d16f1252e1
commit b06aece751
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/Intent.java
View File

@@ -6181,8 +6181,12 @@ public class Intent implements Parcelable, Cloneable {
* who sent the intent. * who sent the intent.
* @hide * @hide
*/ */
public void setContentUserHint(int contentUserHint) { public void prepareToLeaveUser(int userId) {
mContentUserHint = contentUserHint; // If mContentUserHint is not UserHandle.USER_CURRENT, the intent has already left a user.
// We want mContentUserHint to refer to the original user, so don't do anything.
if (mContentUserHint == UserHandle.USER_CURRENT) {
mContentUserHint = userId;
}
} }
/** /**

4
core/java/com/android/internal/app/IntentForwarderActivity.java
View File

@@ -87,9 +87,9 @@ public class IntentForwarderActivity extends Activity {
if (canForward(newIntent, targetUserId)) { if (canForward(newIntent, targetUserId)) {
if (newIntent.getAction().equals(Intent.ACTION_CHOOSER)) { if (newIntent.getAction().equals(Intent.ACTION_CHOOSER)) {
Intent innerIntent = (Intent) newIntent.getParcelableExtra(Intent.EXTRA_INTENT); Intent innerIntent = (Intent) newIntent.getParcelableExtra(Intent.EXTRA_INTENT);
innerIntent.setContentUserHint(callingUserId); innerIntent.prepareToLeaveUser(callingUserId);
} else { } else {
newIntent.setContentUserHint(callingUserId); newIntent.prepareToLeaveUser(callingUserId);
} }
final android.content.pm.ResolveInfo ri = getPackageManager().resolveActivityAsUser( final android.content.pm.ResolveInfo ri = getPackageManager().resolveActivityAsUser(

2
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2829,7 +2829,7 @@ final class ActivityStack {
+ " res=" + resultCode + " data=" + resultData); + " res=" + resultCode + " data=" + resultData);
if (resultTo.userId != r.userId) { if (resultTo.userId != r.userId) {
if (resultData != null) { if (resultData != null) {
resultData.setContentUserHint(r.userId); resultData.prepareToLeaveUser(r.userId);
} }
} }
if (r.info.applicationInfo.uid > 0) { if (r.info.applicationInfo.uid > 0) {