diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:36:28 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:36:32 -0700 |
| commit | 7951c459aefeb012638477b762e19b792ecbe009 (patch) | |
| tree | 7a9625e8186f9e040a2daa3121f4189feb1685ac /core/java/android/app/ContextImpl.java | |
| parent | a5e1d21f566c8df750d766c76f6a99432a703c5e (diff) | |
| parent | ea7e91514ee1968d15713e82a5cca745e2c46a05 (diff) | |
| download | frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.zip frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.tar.gz frameworks_base-7951c459aefeb012638477b762e19b792ecbe009.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index a6ec9b6..6df0c37 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -965,6 +965,20 @@ class ContextImpl extends Context { startActivities(intents, null); } + /** @hide */ + @Override + public void startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) { + if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { + throw new AndroidRuntimeException( + "Calling startActivities() from outside of an Activity " + + " context requires the FLAG_ACTIVITY_NEW_TASK flag on first Intent." + + " Is this really what you want?"); + } + mMainThread.getInstrumentation().execStartActivitiesAsUser( + getOuterContext(), mMainThread.getApplicationThread(), null, + (Activity)null, intents, options, userHandle.getIdentifier()); + } + @Override public void startActivities(Intent[] intents, Bundle options) { if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { |