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

Commit 614fd1b5 authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge changes from topic "include-uiccapptype" 

* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
parents 95a2c736 996aa2a1

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ filegroup { 
    visibility: ["//frameworks/opt/net/ike"],

    srcs: [

        "core/java/android/net/annotations/PolicyDirection.java",

        "telephony/java/android/telephony/Annotation.java",

    ],

}

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{}

}

telephony/java/android/telephony/TelephonyManager.java

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