Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b06a20 authored by Chen Xu's avatar Chen Xu
Browse files

move UiccAppType to annotation class 

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

Bug: 135956699
Test: Manual
Change-Id: I1207418cc83217cefc603589496660aa0d4be202
parent 0c2469bb

telephony/java/android/telephony/Annotation.java

+13 −0
Original line number Diff line number Diff line
@@ -590,4 +590,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{}

}

telephony/java/android/telephony/TelephonyManager.java

+1 −13
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import android.telephony.Annotation.CallState; 
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.emergency.EmergencyNumber;

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 */

    public static final int APPTYPE_SIM = PhoneConstants.APPTYPE_SIM;

    /** UICC application type is USIM */