Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose system API EXTRA_REBROADCAST_ON_UNLOCK"

Browse Source 
am: 027bf28b3a

Change-Id: I77b80ddd80d2c797d7a492fd361b0d4153c1383a
This commit is contained in:
Meng Wang
2020-01-17 18:06:31 -08:00
committed by android-build-merger
parent f4fafdbd69 027bf28b3a
commit 071427f6f6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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_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_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";
field public static final String EXTRA_REASON = "android.intent.extra.REASON"; 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_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_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME"; field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";

13
core/java/android/content/Intent.java
View File

@@ -4014,6 +4014,7 @@ public class Intent implements Parcelable, Cloneable {
* <p> * <p>
* @see #EXTRA_SIM_STATE * @see #EXTRA_SIM_STATE
* @see #EXTRA_SIM_LOCKED_REASON * @see #EXTRA_SIM_LOCKED_REASON
* @see #EXTRA_REBROADCAST_ON_UNLOCK
* *
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or * @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or
* {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
@@ -4189,6 +4190,18 @@ public class Intent implements Parcelable, Cloneable {
@SystemApi @SystemApi
public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED"; 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. * Broadcast Action: indicate that the phone service state has changed.
* The intent will have the following extra values:</p> * The intent will have the following extra values:</p>