From 7b55d44afeeedb834df1f161613d766e2385c6d9 Mon Sep 17 00:00:00 2001 From: yomna Date: Wed, 8 May 2024 00:01:20 +0000 Subject: [PATCH] Mark cellular security transparency APIs optional Bug: b/300159864 b/276752426 Test: m Flag: exempt Change-Id: I814d8162ade48559ea35c55ac54f55eaee279e11 --- .../radio/network/IRadioNetworkResponse.aidl | 8 +++++ radio/aidl/vts/radio_network_test.cpp | 36 +++++++++---------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl index d9eea03c7e..b67e8e091c 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -747,6 +747,7 @@ oneway interface IRadioNetworkResponse { /** * Response of isCellularIdentifierTransparencyEnabled. + * This is an optional API. * * @param info Response info struct containing response type, serial no. and error. * @param isEnabled Indicates whether cellular identifier transparency is enabled or not. @@ -757,12 +758,14 @@ oneway interface IRadioNetworkResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED */ void isCellularIdentifierTransparencyEnabledResponse( in RadioResponseInfo info, boolean isEnabled); /** * Response of setCellularIdentifierTransparencyEnabled. + * This is an optional API. * * @param info Response info struct containing response type, serial no. and error. * @@ -773,11 +776,13 @@ oneway interface IRadioNetworkResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:INVALID_STATE + * RadioError:REQUEST_NOT_SUPPORTED */ void setCellularIdentifierTransparencyEnabledResponse(in RadioResponseInfo info); /** * Response of setSecurityAlgorithmsUpdatedEnabled. + * This is an optional API. * * @param info Response info struct containing response type, serial no. and error. * @@ -788,11 +793,13 @@ oneway interface IRadioNetworkResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:INVALID_STATE + * RadioError:REQUEST_NOT_SUPPORTED */ void setSecurityAlgorithmsUpdatedEnabledResponse(in RadioResponseInfo info); /** * Response of isSecurityAlgorithmsUpdatedEnabled. + * This is an optional API. * * @param info Response info struct containing response type, serial no. and error. * @param isEnabled Indicates whether cellular ciphering transparency is enabled or not. @@ -803,6 +810,7 @@ oneway interface IRadioNetworkResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED */ void isSecurityAlgorithmsUpdatedEnabledResponse( in RadioResponseInfo info, in boolean isEnabled); diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index 867be04e85..802528b301 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -2447,9 +2447,9 @@ TEST_P(RadioNetworkTest, isCellularIdentifierTransparencyEnabled) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); } TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { @@ -2478,9 +2478,9 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); // Assert the value has changed serial = GetRandomSerialNumber(); @@ -2490,9 +2490,9 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled); // Reset original state @@ -2531,9 +2531,9 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); // Assert the value has changed serial = GetRandomSerialNumber(); @@ -2543,9 +2543,9 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); EXPECT_EQ(valueToSet, radioRsp_network->isSecurityAlgorithmsUpdatedEnabled); // Reset original state @@ -2577,7 +2577,7 @@ TEST_P(RadioNetworkTest, isSecurityAlgorithmsUpdatedEnabled) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); }