Merge "Expose system API EXTRA_REBROADCAST_ON_UNLOCK" am: 027bf28b3a am: 071427f6f6 am: 420b9476dc (9c7b6c80) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1819,6 +1819,7 @@ package android.content {
		field public static final String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME";
		field public static final String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";
		field public static final String EXTRA_REASON = "android.intent.extra.REASON";
		field @Deprecated public static final String EXTRA_REBROADCAST_ON_UNLOCK = "rebroadcastOnUnlock";
		field public static final String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";
		field public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
		field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";

+13 −0

Original line number	Diff line number	Diff line
		@@ -4021,6 +4021,7 @@ public class Intent implements Parcelable, Cloneable {
		* <p>
		* @see #EXTRA_SIM_STATE
		* @see #EXTRA_SIM_LOCKED_REASON
		* @see #EXTRA_REBROADCAST_ON_UNLOCK
		*
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or
		* {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		@@ -4196,6 +4197,18 @@ public class Intent implements Parcelable, Cloneable {
		@SystemApi
		public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED";

		/**
		* The extra used with {@link #ACTION_SIM_STATE_CHANGED} for indicating whether this broadcast
		* is a rebroadcast on unlock. Defaults to {@code false} if not specified.
		*
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or
		* {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String EXTRA_REBROADCAST_ON_UNLOCK = "rebroadcastOnUnlock";

		/**
		* Broadcast Action: indicate that the phone service state has changed.
		* The intent will have the following extra values:</p>