diff options
| author | 2020-01-17 18:06:31 -0800 | |
|---|---|---|
| committer | 2020-01-17 18:06:31 -0800 | |
| commit | 071427f6f691f7799cee303bcc7532798ebddcdd (patch) | |
| tree | 7a2c3909fe71e783fa9aad6d5d705097f1bf4e5e | |
| parent | f4fafdbd6921355e10c2833beb953f43b41bdf13 (diff) | |
| parent | 027bf28b3a346a123fcd626ba9947bb1e029b2ca (diff) | |
Merge "Expose system API EXTRA_REBROADCAST_ON_UNLOCK"
am: 027bf28b3a
Change-Id: I77b80ddd80d2c797d7a492fd361b0d4153c1383a
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 98701fd5c599..bf8dc48c7a8a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1653,6 +1653,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"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 281732cdd0ad..5a9474b44666 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4014,6 +4014,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} @@ -4190,6 +4191,18 @@ public class Intent implements Parcelable, Cloneable { 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> * <p> |