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

Merge "Fix the javadoc dead links for SIM states in Intent class" into main am: 91a329f23b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467469

Change-Id: I82a8cb4a3e411af9f4eb5d7c5040036d5a1125dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-02 20:34:17 +00:00
committed by Automerger Merge Worker
parent dea4c2613b 91a329f23b
commit 4b13bda7c2
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4479,8 +4479,8 @@ public class Intent implements Parcelable, Cloneable {
* @see #EXTRA_SIM_LOCKED_REASON * @see #EXTRA_SIM_LOCKED_REASON
* @see #EXTRA_REBROADCAST_ON_UNLOCK * @see #EXTRA_REBROADCAST_ON_UNLOCK
* *
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED} or
* {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
* *
* @hide * @hide
*/ */
@@ -4503,42 +4503,42 @@ public class Intent implements Parcelable, Cloneable {
* @see #SIM_STATE_IMSI * @see #SIM_STATE_IMSI
* @see #SIM_STATE_LOADED * @see #SIM_STATE_LOADED
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String EXTRA_SIM_STATE = "ss"; public static final String EXTRA_SIM_STATE = "ss";
/** /**
* The intent value UNKNOWN represents the SIM state unknown * The intent value UNKNOWN represents the SIM state unknown
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_UNKNOWN = "UNKNOWN"; public static final String SIM_STATE_UNKNOWN = "UNKNOWN";
/** /**
* The intent value NOT_READY means that the SIM is not ready eg. radio is off or powering on * The intent value NOT_READY means that the SIM is not ready eg. radio is off or powering on
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_NOT_READY = "NOT_READY"; public static final String SIM_STATE_NOT_READY = "NOT_READY";
/** /**
* The intent value ABSENT means the SIM card is missing * The intent value ABSENT means the SIM card is missing
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_ABSENT = "ABSENT"; public static final String SIM_STATE_ABSENT = "ABSENT";
/** /**
* The intent value PRESENT means the device has a SIM card inserted * The intent value PRESENT means the device has a SIM card inserted
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_PRESENT = "PRESENT"; public static final String SIM_STATE_PRESENT = "PRESENT";
/** /**
* The intent value CARD_IO_ERROR means for three consecutive times there was SIM IO error * The intent value CARD_IO_ERROR means for three consecutive times there was SIM IO error
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
static public final String SIM_STATE_CARD_IO_ERROR = "CARD_IO_ERROR"; static public final String SIM_STATE_CARD_IO_ERROR = "CARD_IO_ERROR";
@@ -4546,35 +4546,35 @@ public class Intent implements Parcelable, Cloneable {
* The intent value CARD_RESTRICTED means card is present but not usable due to carrier * The intent value CARD_RESTRICTED means card is present but not usable due to carrier
* restrictions * restrictions
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
static public final String SIM_STATE_CARD_RESTRICTED = "CARD_RESTRICTED"; static public final String SIM_STATE_CARD_RESTRICTED = "CARD_RESTRICTED";
/** /**
* The intent value LOCKED means the SIM is locked by PIN or by network * The intent value LOCKED means the SIM is locked by PIN or by network
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_LOCKED = "LOCKED"; public static final String SIM_STATE_LOCKED = "LOCKED";
/** /**
* The intent value READY means the SIM is ready to be accessed * The intent value READY means the SIM is ready to be accessed
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_READY = "READY"; public static final String SIM_STATE_READY = "READY";
/** /**
* The intent value IMSI means the SIM IMSI is ready in property * The intent value IMSI means the SIM IMSI is ready in property
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_IMSI = "IMSI"; public static final String SIM_STATE_IMSI = "IMSI";
/** /**
* The intent value LOADED means all SIM records, including IMSI, are loaded * The intent value LOADED means all SIM records, including IMSI, are loaded
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED}
*/ */
public static final String SIM_STATE_LOADED = "LOADED"; public static final String SIM_STATE_LOADED = "LOADED";
@@ -4588,21 +4588,24 @@ public class Intent implements Parcelable, Cloneable {
* @see #SIM_ABSENT_ON_PERM_DISABLED * @see #SIM_ABSENT_ON_PERM_DISABLED
* *
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * @deprecated Use
* {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
public static final String EXTRA_SIM_LOCKED_REASON = "reason"; public static final String EXTRA_SIM_LOCKED_REASON = "reason";
/** /**
* The intent value PIN means the SIM is locked on PIN1 * The intent value PIN means the SIM is locked on PIN1
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * @deprecated Use
* {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
public static final String SIM_LOCKED_ON_PIN = "PIN"; public static final String SIM_LOCKED_ON_PIN = "PIN";
/** /**
* The intent value PUK means the SIM is locked on PUK1 * The intent value PUK means the SIM is locked on PUK1
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * @deprecated Use
* {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
/* PUK means ICC is locked on PUK1 */ /* PUK means ICC is locked on PUK1 */
public static final String SIM_LOCKED_ON_PUK = "PUK"; public static final String SIM_LOCKED_ON_PUK = "PUK";
@@ -4610,14 +4613,16 @@ public class Intent implements Parcelable, Cloneable {
/** /**
* The intent value NETWORK means the SIM is locked on NETWORK PERSONALIZATION * The intent value NETWORK means the SIM is locked on NETWORK PERSONALIZATION
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * @deprecated Use
* {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
public static final String SIM_LOCKED_NETWORK = "NETWORK"; public static final String SIM_LOCKED_NETWORK = "NETWORK";
/** /**
* The intent value PERM_DISABLED means SIM is permanently disabled due to puk fails * The intent value PERM_DISABLED means SIM is permanently disabled due to puk fails
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * @deprecated Use
* {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED"; public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED";
@@ -4626,8 +4631,8 @@ public class Intent implements Parcelable, Cloneable {
* is a rebroadcast on unlock. Defaults to {@code false} if not specified. * is a rebroadcast on unlock. Defaults to {@code false} if not specified.
* *
* @hide * @hide
* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED} or * @deprecated Use {@link android.telephony.TelephonyManager#ACTION_SIM_CARD_STATE_CHANGED} or
* {@link #ACTION_SIM_APPLICATION_STATE_CHANGED} * {@link android.telephony.TelephonyManager#ACTION_SIM_APPLICATION_STATE_CHANGED}
*/ */
public static final String EXTRA_REBROADCAST_ON_UNLOCK = "rebroadcastOnUnlock"; public static final String EXTRA_REBROADCAST_ON_UNLOCK = "rebroadcastOnUnlock";