move UiccAppType to annotation class am: bcc31107cd am: 15add5d1a8 (69424af7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/Annotation.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -596,4 +596,17 @@ public class Annotation {
		@Retention(RetentionPolicy.SOURCE)
		public @interface ImsAudioCodec {
		}

		/**
		* UICC SIM Application Types
		*/
		@IntDef(prefix = { "APPTYPE_" }, value = {
		TelephonyManager.APPTYPE_SIM,
		TelephonyManager.APPTYPE_USIM,
		TelephonyManager.APPTYPE_RUIM,
		TelephonyManager.APPTYPE_CSIM,
		TelephonyManager.APPTYPE_ISIM
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UiccAppType{}
		}

+1 −13

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ import android.telephony.Annotation.DataState;
		import android.telephony.Annotation.NetworkType;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.Annotation.SimActivationState;
		import android.telephony.Annotation.UiccAppType;
		import android.telephony.VisualVoicemailService.VisualVoicemailTask;
		import android.telephony.data.ApnSetting;
		import android.telephony.emergency.EmergencyNumber;
		@@ -6718,19 +6719,6 @@ public class TelephonyManager {
		}
		}

		/**
		* UICC SIM Application Types
		* @hide
		*/
		@IntDef(prefix = { "APPTYPE_" }, value = {
		APPTYPE_SIM,
		APPTYPE_USIM,
		APPTYPE_RUIM,
		APPTYPE_CSIM,
		APPTYPE_ISIM
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UiccAppType{}
		/** UICC application type is SIM */
		public static final int APPTYPE_SIM = PhoneConstants.APPTYPE_SIM;
		/** UICC application type is USIM */