diff options
| author | 2020-01-10 00:23:28 +0000 | |
|---|---|---|
| committer | 2020-01-10 00:23:28 +0000 | |
| commit | 614fd1b51bf8576271238acf4e5a7baf82f4e4bd (patch) | |
| tree | e28f228526802286ea25d5b56b6ac322abea9f3d | |
| parent | 95a2c736e97d2b89298e65714f193b31410d1278 (diff) | |
| parent | 996aa2a14627bc90c110e5af68e0f4854db516e8 (diff) | |
Merge changes from topic "include-uiccapptype"
* changes:
Make mainline IPsec(IKE) to statically include @UiccAppType
move UiccAppType to annotation class
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/Annotation.java | 13 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 14 |
3 files changed, 15 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index ca60a70bf1de..6535da5f4ff9 100644 --- a/Android.bp +++ b/Android.bp @@ -591,6 +591,7 @@ filegroup { visibility: ["//frameworks/opt/net/ike"], srcs: [ "core/java/android/net/annotations/PolicyDirection.java", + "telephony/java/android/telephony/Annotation.java", ], } diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index 7482ecc85324..9e6dfef0608b 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -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{} } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8a2ebe2468e0..ca88d622e9b0 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 */ |