diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/NasProtocolMessage.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/NasProtocolMessage.aidl index 9f852cc530..4fbc802873 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/NasProtocolMessage.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/NasProtocolMessage.aidl @@ -44,4 +44,7 @@ enum NasProtocolMessage { AUTHENTICATION_AND_CIPHERING_RESPONSE = 6, REGISTRATION_REQUEST = 7, DEREGISTRATION_REQUEST = 8, + CM_REESTABLISHMENT_REQUEST = 9, + CM_SERVICE_REQUEST = 10, + IMSI_DETACH_INDICATION = 11, } diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl index 32890ecf01..f1c7aa1011 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl @@ -669,7 +669,7 @@ oneway interface IRadioNetwork { * Note: Cellular identifiers disclosed in uplink messages covered under a NAS Security Context * as well as identifiers disclosed in downlink messages are out of scope. * - * This feature applies to 2g, 3g, 4g, and 5g (SA and NSA) messages sent before a NAS security + * This feature applies to 2g, 3g, 4g, and 5g (SA and NSA) messages sent before a security * context is established. In scope message definitions and their associated spec references can * be found in NasProtocolMessage. * @@ -678,8 +678,6 @@ oneway interface IRadioNetwork { * re-enables this functionality. The modem may choose to stop tracking cellular identifiers in * the clear during this time. * - * Note: The default value of enabled shall be true. - * * @param serial Serial number of request * @param enabled Whether or not to enable sending indications for cellular identifiers in the * clear diff --git a/radio/aidl/android/hardware/radio/network/NasProtocolMessage.aidl b/radio/aidl/android/hardware/radio/network/NasProtocolMessage.aidl index e8d80479a3..1225c41915 100644 --- a/radio/aidl/android/hardware/radio/network/NasProtocolMessage.aidl +++ b/radio/aidl/android/hardware/radio/network/NasProtocolMessage.aidl @@ -54,5 +54,14 @@ enum NasProtocolMessage { REGISTRATION_REQUEST = 7, // Reference: 3GPP TS 24.501 8.2.12 // Applies to 5g networks - DEREGISTRATION_REQUEST = 8 + DEREGISTRATION_REQUEST = 8, + // Reference: 3GPP TS 24.008 9.2.4 + // Applies to 2g and 3g networks + CM_REESTABLISHMENT_REQUEST = 9, + // Reference: 3GPP TS 24.008 9.2.9 + // Applies to 2g and 3g networks + CM_SERVICE_REQUEST = 10, + // Reference: 3GPP TS 24.008 9.2.14 + // Applies to 2g and 3g networks. Used for circuit-switched detach. + IMSI_DETACH_INDICATION = 11 } diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index c893553571..ecf6df8f45 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -2433,10 +2433,6 @@ TEST_P(RadioNetworkTest, isCellularIdentifierTransparencyEnabled) { ASSERT_TRUE(CheckAnyOfErrors( radioRsp_network->rspInfo.error, {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); - - // the default value should be true if we have not called the setter - EXPECT_TRUE(radioRsp_network->isCellularIdentifierTransparencyEnabled); - } TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {