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

Commit 6f3cd4e8 authored by Yomna Nasser's avatar Yomna Nasser Committed by Android (Google) Code Review
Browse files

Merge "Update enums to match ConnectionEvent.aidl and SecurityAlgorithm.aidl" into main

parents 9d918511 0996e608

telephony/java/android/telephony/SecurityAlgorithmUpdate.java

+22 −13
Original line number Diff line number Diff line
@@ -129,11 +129,15 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
    public static final int CONNECTION_EVENT_NAS_SIGNALLING_LTE = 4;

    public static final int CONNECTION_EVENT_AS_SIGNALLING_LTE = 5;

    public static final int CONNECTION_EVENT_VOLTE_SIP = 6;

    public static final int CONNECTION_EVENT_VOLTE_RTP = 7;

    public static final int CONNECTION_EVENT_NAS_SIGNALLING_5G = 8;

    public static final int CONNECTION_EVENT_AS_SIGNALLING_5G = 9;

    public static final int CONNECTION_EVENT_VONR_SIP = 10;

    public static final int CONNECTION_EVENT_VONR_RTP = 11;

    public static final int CONNECTION_EVENT_VOLTE_SIP_SOS = 7;

    public static final int CONNECTION_EVENT_VOLTE_RTP = 8;

    public static final int CONNECTION_EVENT_VOLTE_RTP_SOS = 9;

    public static final int CONNECTION_EVENT_NAS_SIGNALLING_5G = 10;

    public static final int CONNECTION_EVENT_AS_SIGNALLING_5G = 11;

    public static final int CONNECTION_EVENT_VONR_SIP = 12;

    public static final int CONNECTION_EVENT_VONR_SIP_SOS = 13;

    public static final int CONNECTION_EVENT_VONR_RTP = 14;

    public static final int CONNECTION_EVENT_VONR_RTP_SOS = 15;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)
@@ -141,9 +145,11 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
            CONNECTION_EVENT_PS_SIGNALLING_GPRS, CONNECTION_EVENT_CS_SIGNALLING_3G,

            CONNECTION_EVENT_PS_SIGNALLING_3G, CONNECTION_EVENT_NAS_SIGNALLING_LTE,

            CONNECTION_EVENT_AS_SIGNALLING_LTE, CONNECTION_EVENT_VOLTE_SIP,

            CONNECTION_EVENT_VOLTE_RTP, CONNECTION_EVENT_NAS_SIGNALLING_5G,

            CONNECTION_EVENT_VOLTE_SIP_SOS, CONNECTION_EVENT_VOLTE_RTP,

            CONNECTION_EVENT_VOLTE_RTP_SOS, CONNECTION_EVENT_NAS_SIGNALLING_5G,

            CONNECTION_EVENT_AS_SIGNALLING_5G, CONNECTION_EVENT_VONR_SIP,

            CONNECTION_EVENT_VONR_RTP})

            CONNECTION_EVENT_VONR_SIP_SOS, CONNECTION_EVENT_VONR_RTP,

            CONNECTION_EVENT_VONR_RTP_SOS})

    public @interface ConnectionEvent {

    }
@@ -169,6 +175,7 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
    public static final int SECURITY_ALGORITHM_NEA1 = 56;

    public static final int SECURITY_ALGORITHM_NEA2 = 57;

    public static final int SECURITY_ALGORITHM_NEA3 = 58;

    public static final int SECURITY_ALGORITHM_SIP_NO_IPSEC_CONFIG = 66;

    public static final int SECURITY_ALGORITHM_IMS_NULL = 67;

    public static final int SECURITY_ALGORITHM_SIP_NULL = 68;

    public static final int SECURITY_ALGORITHM_AES_GCM = 69;
@@ -178,6 +185,7 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
    public static final int SECURITY_ALGORITHM_AES_EDE3_CBC = 73;

    public static final int SECURITY_ALGORITHM_HMAC_SHA1_96 = 74;

    public static final int SECURITY_ALGORITHM_HMAC_MD5_96 = 75;

    public static final int SECURITY_ALGORITHM_RTP = 85;

    public static final int SECURITY_ALGORITHM_SRTP_NULL = 86;

    public static final int SECURITY_ALGORITHM_SRTP_AES_COUNTER = 87;

    public static final int SECURITY_ALGORITHM_SRTP_AES_F8 = 88;
@@ -199,15 +207,16 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
            SECURITY_ALGORITHM_UEA2, SECURITY_ALGORITHM_EEA0, SECURITY_ALGORITHM_EEA1,

            SECURITY_ALGORITHM_EEA2, SECURITY_ALGORITHM_EEA3, SECURITY_ALGORITHM_NEA0,

            SECURITY_ALGORITHM_NEA1, SECURITY_ALGORITHM_NEA2, SECURITY_ALGORITHM_NEA3,

            SECURITY_ALGORITHM_IMS_NULL, SECURITY_ALGORITHM_SIP_NULL, SECURITY_ALGORITHM_AES_GCM,

            SECURITY_ALGORITHM_SIP_NO_IPSEC_CONFIG, SECURITY_ALGORITHM_IMS_NULL,

            SECURITY_ALGORITHM_SIP_NULL, SECURITY_ALGORITHM_AES_GCM,

            SECURITY_ALGORITHM_AES_GMAC, SECURITY_ALGORITHM_AES_CBC,

            SECURITY_ALGORITHM_DES_EDE3_CBC, SECURITY_ALGORITHM_AES_EDE3_CBC,

            SECURITY_ALGORITHM_HMAC_SHA1_96, SECURITY_ALGORITHM_HMAC_MD5_96,

            SECURITY_ALGORITHM_SRTP_NULL, SECURITY_ALGORITHM_SRTP_AES_COUNTER,

            SECURITY_ALGORITHM_SRTP_AES_F8, SECURITY_ALGORITHM_SRTP_HMAC_SHA1,

            SECURITY_ALGORITHM_ENCR_AES_GCM_16, SECURITY_ALGORITHM_ENCR_AES_CBC,

            SECURITY_ALGORITHM_AUTH_HMAC_SHA2_256_128, SECURITY_ALGORITHM_UNKNOWN,

            SECURITY_ALGORITHM_OTHER, SECURITY_ALGORITHM_ORYX})

            SECURITY_ALGORITHM_RTP, SECURITY_ALGORITHM_SRTP_NULL,

            SECURITY_ALGORITHM_SRTP_AES_COUNTER, SECURITY_ALGORITHM_SRTP_AES_F8,

            SECURITY_ALGORITHM_SRTP_HMAC_SHA1, SECURITY_ALGORITHM_ENCR_AES_GCM_16,

            SECURITY_ALGORITHM_ENCR_AES_CBC, SECURITY_ALGORITHM_AUTH_HMAC_SHA2_256_128,

            SECURITY_ALGORITHM_UNKNOWN, SECURITY_ALGORITHM_OTHER, SECURITY_ALGORITHM_ORYX})

    public @interface SecurityAlgorithm {

    }