summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-01-23 13:13:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-01-23 13:13:47 +0000
commitde3aea69042fc77c533a363184efe47e844010ea (patch)
treed6cd6ceb56330220c1b9cab5492350500e2bb34d /core/java/android
parent4d69df3eb162d08d6b8448f78c0ea4b2e0c9ed0e (diff)
parentc857f02a5b2572cda3a91e783c3f2c96169fd9ed (diff)
Merge "Add an intent extra that contains a number of milliseconds."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 3c487a13af4b..a6b47ff1320d 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2008,6 +2008,15 @@ public class Intent implements Parcelable, Cloneable {
"android.intent.extra.PERMISSION_GROUP_NAME";
/**
+ * Intent extra: The number of milliseconds.
+ * <p>
+ * Type: long
+ * </p>
+ */
+ public static final String EXTRA_DURATION_MILLIS =
+ "android.intent.extra.DURATION_MILLIS";
+
+ /**
* Activity action: Launch UI to review app uses of permissions.
* <p>
* Input: {@link #EXTRA_PERMISSION_NAME} specifies the permission name
@@ -2020,11 +2029,16 @@ public class Intent implements Parcelable, Cloneable {
* {@link #EXTRA_PERMISSION_NAME}.
* </p>
* <p>
+ * Input: {@link #EXTRA_DURATION_MILLIS} specifies the minimum number of milliseconds of recent
+ * activity to show (optional). Must be non-negative.
+ * </p>
+ * <p>
* Output: Nothing.
* </p>
*
* @see #EXTRA_PERMISSION_NAME
* @see #EXTRA_PERMISSION_GROUP_NAME
+ * @see #EXTRA_DURATION_MILLIS
*
* @hide
*/