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

Merge changes from topic "include-uiccapptype"

Browse Source 
* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
This commit is contained in:
Yan Yan
2020-01-10 00:23:28 +00:00
committed by Gerrit Code Review
parent 95a2c736e9 996aa2a146
commit 614fd1b51b
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -591,6 +591,7 @@ filegroup {
visibility: ["//frameworks/opt/net/ike"], visibility: ["//frameworks/opt/net/ike"],
srcs: [ srcs: [
"core/java/android/net/annotations/PolicyDirection.java", "core/java/android/net/annotations/PolicyDirection.java",
"telephony/java/android/telephony/Annotation.java",
], ],
} }

13
telephony/java/android/telephony/Annotation.java
View File

@@ -596,4 +596,17 @@ public class Annotation {
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface ImsAudioCodec { 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{}
} }

14
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -77,6 +77,7 @@ import android.telephony.Annotation.DataState;
import android.telephony.Annotation.NetworkType; import android.telephony.Annotation.NetworkType;
import android.telephony.Annotation.RadioPowerState; import android.telephony.Annotation.RadioPowerState;
import android.telephony.Annotation.SimActivationState; import android.telephony.Annotation.SimActivationState;
import android.telephony.Annotation.UiccAppType;
import android.telephony.VisualVoicemailService.VisualVoicemailTask; import android.telephony.VisualVoicemailService.VisualVoicemailTask;
import android.telephony.data.ApnSetting; import android.telephony.data.ApnSetting;
import android.telephony.emergency.EmergencyNumber; 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 */ /** UICC application type is SIM */
public static final int APPTYPE_SIM = PhoneConstants.APPTYPE_SIM; public static final int APPTYPE_SIM = PhoneConstants.APPTYPE_SIM;
/** UICC application type is USIM */ /** UICC application type is USIM */