diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-10-14 10:48:18 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2014-10-14 17:57:28 -0700 |
| commit | 9797880808320e3a7bae1f59bc7e0c5a13189e5f (patch) | |
| tree | b8e469a4be51241d1740f316faa616ed939c6247 /core/java/android/app/Activity.java | |
| parent | dc876b56217c588596661ca514b4bdb8a6cfe843 (diff) | |
| download | frameworks_base-9797880808320e3a7bae1f59bc7e0c5a13189e5f.zip frameworks_base-9797880808320e3a7bae1f59bc7e0c5a13189e5f.tar.gz frameworks_base-9797880808320e3a7bae1f59bc7e0c5a13189e5f.tar.bz2 | |
Start cross profile intents as caller.
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.
Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 0e98175..4b705dd 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3847,14 +3847,14 @@ public class Activity extends ContextThemeWrapper * their launch had come from the original activity. * @hide */ - public void startActivityAsCaller(Intent intent, @Nullable Bundle options) { + public void startActivityAsCaller(Intent intent, @Nullable Bundle options, int userId) { if (mParent != null) { throw new RuntimeException("Can't be called from a child"); } Instrumentation.ActivityResult ar = mInstrumentation.execStartActivityAsCaller( this, mMainThread.getApplicationThread(), mToken, this, - intent, -1, options); + intent, -1, options, userId); if (ar != null) { mMainThread.sendActivityResult( mToken, mEmbeddedID, -1, ar.getResultCode(), |