diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/ConnectionEvent.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/ConnectionEvent.aidl index eedb8edefa..1529512695 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/ConnectionEvent.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/ConnectionEvent.aidl @@ -42,9 +42,13 @@ enum ConnectionEvent { NAS_SIGNALLING_LTE = 4, AS_SIGNALLING_LTE = 5, VOLTE_SIP = 6, - VOLTE_RTP = 7, - NAS_SIGNALLING_5G = 8, - AS_SIGNALLING_5G = 9, - VONR_SIP = 10, - VONR_RTP = 11, + VOLTE_SIP_SOS = 7, + VOLTE_RTP = 8, + VOLTE_RTP_SOS = 9, + NAS_SIGNALLING_5G = 10, + AS_SIGNALLING_5G = 11, + VONR_SIP = 12, + VONR_SIP_SOS = 13, + VONR_RTP = 14, + VONR_RTP_SOS = 15, } diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/SecurityAlgorithm.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/SecurityAlgorithm.aidl index c590d2bede..c3333bf190 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/SecurityAlgorithm.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/SecurityAlgorithm.aidl @@ -57,6 +57,7 @@ enum SecurityAlgorithm { NEA1 = 56, NEA2 = 57, NEA3 = 58, + SIP_NO_IPSEC_CONFIG = 66, IMS_NULL = 67, SIP_NULL = 68, AES_GCM = 69, @@ -66,6 +67,7 @@ enum SecurityAlgorithm { AES_EDE3_CBC = 73, HMAC_SHA1_96 = 74, HMAC_MD5_96 = 75, + RTP = 85, SRTP_NULL = 86, SRTP_AES_COUNTER = 87, SRTP_AES_F8 = 88, diff --git a/radio/aidl/android/hardware/radio/network/ConnectionEvent.aidl b/radio/aidl/android/hardware/radio/network/ConnectionEvent.aidl index 2e39ebf791..d5f367f646 100644 --- a/radio/aidl/android/hardware/radio/network/ConnectionEvent.aidl +++ b/radio/aidl/android/hardware/radio/network/ConnectionEvent.aidl @@ -42,14 +42,20 @@ enum ConnectionEvent { AS_SIGNALLING_LTE = 5, // VoLTE + // Note: emergency calls could use either normal or SOS (emergency) PDN in practice VOLTE_SIP = 6, - VOLTE_RTP = 7, + VOLTE_SIP_SOS = 7, + VOLTE_RTP = 8, + VOLTE_RTP_SOS = 9, // 5G packet services - NAS_SIGNALLING_5G = 8, - AS_SIGNALLING_5G = 9, + NAS_SIGNALLING_5G = 10, + AS_SIGNALLING_5G = 11, // VoNR - VONR_SIP = 10, - VONR_RTP = 11, + // Note: emergency calls could use either normal or SOS (emergency) PDN in practice + VONR_SIP = 12, + VONR_SIP_SOS = 13, + VONR_RTP = 14, + VONR_RTP_SOS = 15 } diff --git a/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl b/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl index 19feeeff59..01f732738b 100644 --- a/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl +++ b/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl @@ -60,7 +60,11 @@ enum SecurityAlgorithm { NEA3 = 58, // IMS and SIP layer security (See 3GPP TS 33.203) + // No IPsec config + SIP_NO_IPSEC_CONFIG = 66, IMS_NULL = 67, + + // Has IPsec config SIP_NULL = 68, AES_GCM = 69, AES_GMAC = 70, @@ -70,7 +74,10 @@ enum SecurityAlgorithm { HMAC_SHA1_96 = 74, HMAC_MD5_96 = 75, - // RTP (see 3GPP TS 33.328) + // RTP and SRTP (see 3GPP TS 33.328) + // When SRTP is not being used + RTP = 85, + // When SRTP is available and used SRTP_NULL = 86, SRTP_AES_COUNTER = 87, SRTP_AES_F8 = 88,