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

move UiccAppType to annotation class

Browse Source 
this is to allow non-telephony mainline module statically link
to telephony annotatons.

Bug: 135956699
Test: Manual
Change-Id: I1207418cc83217cefc603589496660aa0d4be202
This commit is contained in:
Chen Xu
2020-01-01 22:46:48 -08:00
parent 0c2469bbc1
commit d1b06a2090
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,4 +590,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

@@ -73,6 +73,7 @@ import android.telephony.Annotation.CallState;
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.emergency.EmergencyNumber; import android.telephony.emergency.EmergencyNumber;
import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories; import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;
@@ -6768,19 +6769,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 */