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

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

Merge "Update algorithms in SecurityAlgorithmUpdate.java" into main

parents 378545d1 89e7065c

telephony/java/android/telephony/SecurityAlgorithmUpdate.java

+10 −10
Original line number Original line Diff line number Diff line
@@ -169,6 +169,7 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
    public static final int SECURITY_ALGORITHM_NEA1 = 56;

    public static final int SECURITY_ALGORITHM_NEA1 = 56;

    public static final int SECURITY_ALGORITHM_NEA2 = 57;

    public static final int SECURITY_ALGORITHM_NEA2 = 57;

    public static final int SECURITY_ALGORITHM_NEA3 = 58;

    public static final int SECURITY_ALGORITHM_NEA3 = 58;

    public static final int SECURITY_ALGORITHM_IMS_NULL = 67;

    public static final int SECURITY_ALGORITHM_SIP_NULL = 68;

    public static final int SECURITY_ALGORITHM_SIP_NULL = 68;

    public static final int SECURITY_ALGORITHM_AES_GCM = 69;

    public static final int SECURITY_ALGORITHM_AES_GCM = 69;

    public static final int SECURITY_ALGORITHM_AES_GMAC = 70;

    public static final int SECURITY_ALGORITHM_AES_GMAC = 70;
@@ -176,9 +177,8 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
    public static final int SECURITY_ALGORITHM_DES_EDE3_CBC = 72;

    public static final int SECURITY_ALGORITHM_DES_EDE3_CBC = 72;

    public static final int SECURITY_ALGORITHM_AES_EDE3_CBC = 73;

    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_SHA1_96 = 74;

    public static final int SECURITY_ALGORITHM_HMAC_SHA1_96_NULL = 75;

    public static final int SECURITY_ALGORITHM_HMAC_MD5_96 = 75;

    public static final int SECURITY_ALGORITHM_HMAC_MD5_96 = 76;

    public static final int SECURITY_ALGORITHM_SRTP_NULL = 86;

    public static final int SECURITY_ALGORITHM_HMAC_MD5_96_NULL = 77;

    public static final int SECURITY_ALGORITHM_SRTP_AES_COUNTER = 87;

    public static final int SECURITY_ALGORITHM_SRTP_AES_COUNTER = 87;

    public static final int SECURITY_ALGORITHM_SRTP_AES_F8 = 88;

    public static final int SECURITY_ALGORITHM_SRTP_AES_F8 = 88;

    public static final int SECURITY_ALGORITHM_SRTP_HMAC_SHA1 = 89;

    public static final int SECURITY_ALGORITHM_SRTP_HMAC_SHA1 = 89;
@@ -199,15 +199,15 @@ public final class SecurityAlgorithmUpdate implements Parcelable { 
            SECURITY_ALGORITHM_UEA2, SECURITY_ALGORITHM_EEA0, SECURITY_ALGORITHM_EEA1,

            SECURITY_ALGORITHM_UEA2, SECURITY_ALGORITHM_EEA0, SECURITY_ALGORITHM_EEA1,

            SECURITY_ALGORITHM_EEA2, SECURITY_ALGORITHM_EEA3, SECURITY_ALGORITHM_NEA0,

            SECURITY_ALGORITHM_EEA2, SECURITY_ALGORITHM_EEA3, SECURITY_ALGORITHM_NEA0,

            SECURITY_ALGORITHM_NEA1, SECURITY_ALGORITHM_NEA2, SECURITY_ALGORITHM_NEA3,

            SECURITY_ALGORITHM_NEA1, SECURITY_ALGORITHM_NEA2, SECURITY_ALGORITHM_NEA3,

            SECURITY_ALGORITHM_SIP_NULL, SECURITY_ALGORITHM_AES_GCM,

            SECURITY_ALGORITHM_IMS_NULL, SECURITY_ALGORITHM_SIP_NULL, SECURITY_ALGORITHM_AES_GCM,

            SECURITY_ALGORITHM_AES_GMAC, SECURITY_ALGORITHM_AES_CBC,

            SECURITY_ALGORITHM_AES_GMAC, SECURITY_ALGORITHM_AES_CBC,

            SECURITY_ALGORITHM_DES_EDE3_CBC, SECURITY_ALGORITHM_AES_EDE3_CBC,

            SECURITY_ALGORITHM_DES_EDE3_CBC, SECURITY_ALGORITHM_AES_EDE3_CBC,

            SECURITY_ALGORITHM_HMAC_SHA1_96, SECURITY_ALGORITHM_HMAC_SHA1_96_NULL,

            SECURITY_ALGORITHM_HMAC_SHA1_96, SECURITY_ALGORITHM_HMAC_MD5_96,

            SECURITY_ALGORITHM_HMAC_MD5_96, SECURITY_ALGORITHM_HMAC_MD5_96_NULL,

            SECURITY_ALGORITHM_SRTP_NULL, SECURITY_ALGORITHM_SRTP_AES_COUNTER,

            SECURITY_ALGORITHM_SRTP_AES_COUNTER, SECURITY_ALGORITHM_SRTP_AES_F8,

            SECURITY_ALGORITHM_SRTP_AES_F8, SECURITY_ALGORITHM_SRTP_HMAC_SHA1,

            SECURITY_ALGORITHM_SRTP_HMAC_SHA1, SECURITY_ALGORITHM_ENCR_AES_GCM_16,

            SECURITY_ALGORITHM_ENCR_AES_GCM_16, SECURITY_ALGORITHM_ENCR_AES_CBC,

            SECURITY_ALGORITHM_ENCR_AES_CBC, SECURITY_ALGORITHM_AUTH_HMAC_SHA2_256_128,

            SECURITY_ALGORITHM_AUTH_HMAC_SHA2_256_128, SECURITY_ALGORITHM_UNKNOWN,

            SECURITY_ALGORITHM_UNKNOWN, SECURITY_ALGORITHM_OTHER, SECURITY_ALGORITHM_ORYX})

            SECURITY_ALGORITHM_OTHER, SECURITY_ALGORITHM_ORYX})

    public @interface SecurityAlgorithm {

    public @interface SecurityAlgorithm {

    }

    }