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/TaskStackBuilder.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/TaskStackBuilder.java')
-rw-r--r-- | core/java/android/app/TaskStackBuilder.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java index cadf5e4..1eee5fd 100644 --- a/core/java/android/app/TaskStackBuilder.java +++ b/core/java/android/app/TaskStackBuilder.java @@ -23,6 +23,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; +import android.os.UserHandle; import android.util.Log; import java.util.ArrayList; @@ -205,18 +206,26 @@ public class TaskStackBuilder { /** * Start the task stack constructed by this builder. - * - * @param options Additional options for how the Activity should be started. - * See {@link android.content.Context#startActivity(Intent, Bundle) - * Context.startActivity(Intent, Bundle)} for more details. + * @hide */ - public void startActivities(Bundle options) { + public void startActivities(Bundle options, UserHandle userHandle) { if (mIntents.isEmpty()) { throw new IllegalStateException( "No intents added to TaskStackBuilder; cannot startActivities"); } - mSourceContext.startActivities(getIntents(), options); + mSourceContext.startActivitiesAsUser(getIntents(), options, userHandle); + } + + /** + * Start the task stack constructed by this builder. + * + * @param options Additional options for how the Activity should be started. + * See {@link android.content.Context#startActivity(Intent, Bundle) + * Context.startActivity(Intent, Bundle)} for more details. + */ + public void startActivities(Bundle options) { + startActivities(options, new UserHandle(UserHandle.myUserId())); } /** |