Merge "Add an intent extra that contains a number of milliseconds." (de3aea69) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10347,6 +10347,7 @@ package android.content {
		field public static final int EXTRA_DOCK_STATE_LE_DESK = 3; // 0x3
		field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0
		field public static final String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
		field public static final String EXTRA_DURATION_MILLIS = "android.intent.extra.DURATION_MILLIS";
		field public static final String EXTRA_EMAIL = "android.intent.extra.EMAIL";
		field public static final String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";
		field public static final String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

+14 −0

Original line number	Diff line number	Diff line
		@@ -2007,6 +2007,15 @@ public class Intent implements Parcelable, Cloneable {
		public static final String EXTRA_PERMISSION_GROUP_NAME =
		"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>
		@@ -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
		*/