diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-24 16:11:18 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-09-24 17:19:03 -0700 |
| commit | ea7e91514ee1968d15713e82a5cca745e2c46a05 (patch) | |
| tree | cea4f88f0db9fa4132f93745ee4605a59a129e80 /core/java/android/app/ContextImpl.java | |
| parent | bc391d58c8d09bd58b57dda20dd9d2281d90db32 (diff) | |
| download | frameworks_base-ea7e91514ee1968d15713e82a5cca745e2c46a05.zip frameworks_base-ea7e91514ee1968d15713e82a5cca745e2c46a05.tar.gz frameworks_base-ea7e91514ee1968d15713e82a5cca745e2c46a05.tar.bz2 | |
AppInfo from Notifications for secondary users
Required wiring up startActivitiesAsUser()
Bug: 7224950
Also fix a bug in navigateUp in secondary user
Change-Id: I114ae2de0457362d62e899fdb94b12239a3eb778
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) { |