Merge "Make IccCardConstants APIs hidden as per API concil's feedback" into rvc-dev (db5c0688) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -1895,30 +1895,13 @@ 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";
		field @Deprecated public static final String EXTRA_SIM_LOCKED_REASON = "reason";
		field @Deprecated public static final String EXTRA_SIM_STATE = "ss";
		field public static final String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";
		field public static final String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";
		field public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 67108864; // 0x4000000
		field public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION";
		field @Deprecated public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED";
		field @Deprecated public static final String SIM_LOCKED_NETWORK = "NETWORK";
		field @Deprecated public static final String SIM_LOCKED_ON_PIN = "PIN";
		field @Deprecated public static final String SIM_LOCKED_ON_PUK = "PUK";
		field @Deprecated public static final String SIM_STATE_ABSENT = "ABSENT";
		field @Deprecated public static final String SIM_STATE_CARD_IO_ERROR = "CARD_IO_ERROR";
		field @Deprecated public static final String SIM_STATE_CARD_RESTRICTED = "CARD_RESTRICTED";
		field @Deprecated public static final String SIM_STATE_IMSI = "IMSI";
		field @Deprecated public static final String SIM_STATE_LOADED = "LOADED";
		field @Deprecated public static final String SIM_STATE_LOCKED = "LOCKED";
		field @Deprecated public static final String SIM_STATE_NOT_READY = "NOT_READY";
		field @Deprecated public static final String SIM_STATE_PRESENT = "PRESENT";
		field @Deprecated public static final String SIM_STATE_READY = "READY";
		field @Deprecated public static final String SIM_STATE_UNKNOWN = "UNKNOWN";
		}

		public class IntentFilter implements android.os.Parcelable {

core/java/android/content/Intent.java

+0 −34

Original line number	Diff line number	Diff line
		@@ -4080,8 +4080,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String EXTRA_SIM_STATE = "ss";

		/**
		@@ -4089,8 +4087,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_UNKNOWN = "UNKNOWN";

		/**
		@@ -4098,8 +4094,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_NOT_READY = "NOT_READY";

		/**
		@@ -4107,8 +4101,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_ABSENT = "ABSENT";

		/**
		@@ -4116,8 +4108,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_PRESENT = "PRESENT";

		/**
		@@ -4125,8 +4115,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		static public final String SIM_STATE_CARD_IO_ERROR = "CARD_IO_ERROR";

		/**
		@@ -4135,8 +4123,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		static public final String SIM_STATE_CARD_RESTRICTED = "CARD_RESTRICTED";

		/**
		@@ -4144,8 +4130,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_LOCKED = "LOCKED";

		/**
		@@ -4153,8 +4137,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_READY = "READY";

		/**
		@@ -4162,8 +4144,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_IMSI = "IMSI";

		/**
		@@ -4171,8 +4151,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_CARD_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_STATE_LOADED = "LOADED";

		/**
		@@ -4187,8 +4165,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String EXTRA_SIM_LOCKED_REASON = "reason";

		/**
		@@ -4196,8 +4172,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_LOCKED_ON_PIN = "PIN";

		/**
		@@ -4206,8 +4180,6 @@ public class Intent implements Parcelable, Cloneable {
		* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		/* PUK means ICC is locked on PUK1 */
		@Deprecated
		@SystemApi
		public static final String SIM_LOCKED_ON_PUK = "PUK";

		/**
		@@ -4215,8 +4187,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_LOCKED_NETWORK = "NETWORK";

		/**
		@@ -4224,8 +4194,6 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		* @deprecated Use {@link #ACTION_SIM_APPLICATION_STATE_CHANGED}
		*/
		@Deprecated
		@SystemApi
		public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED";

		/**
		@@ -4236,8 +4204,6 @@ public class Intent implements Parcelable, Cloneable {
		* @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";

		/**