summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorClara Bayarri <clarabayarri@google.com>2016-01-06 16:57:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-06 16:57:55 +0000
commit8819c61bcfb25bea07cb4f285e7a5220ff43b0b2 (patch)
treeff52bb58953b222e0b7877c5333624d91b384d69 /core/java/android
parent028d6906d5671bcc8239ead2496f9eb10e4a142b (diff)
parentea9b10e64419edbd5d3ed13f82007ffed97af418 (diff)
Merge "Work Challenge: Handle Recents launches"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index c3dfab48acf5..35cd2bef6093 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3604,6 +3604,15 @@ public class Intent implements Parcelable, Cloneable {
public static final String EXTRA_USER_ID = "android.intent.extra.USER_ID";
/**
+ * An int representing the task id to be retrieved. This is used when a launch from recents is
+ * intercepted by another action such as credentials confirmation to remember which task should
+ * be resumed when complete.
+ *
+ * @hide
+ */
+ public static final String EXTRA_TASK_ID = "android.intent.extra.TASK_ID";
+
+ /**
* An Intent[] describing additional, alternate choices you would like shown with
* {@link #ACTION_CHOOSER}.
*