commit d4f594734124f5ea618d8e2c6fba941145e01d67
author Yomna Nasser <yomna@google.com> Thu Dec 22 20:30:13 2022 +0000
committer Yomna Nasser <yomna@google.com> Fri Dec 23 04:17:56 2022 +0000
tree 583f54492122c243ed65d3ff9a39879a5e2fe8d6
parent 9d714e64577274ba86753d2ffb8618a43c40fbad

setNullCipherAndIntegrityEnabled VTS to return REQUEST_NOT_SUPPORTED

Mark setNullCipherAndIntegrityEnabled as optional-to-support.

Bug: b/237529943
Test: atest VtsHalRadioTargetTest
Change-Id: Iff04c12958fe7ad2a07614129a5af339b02192e0

radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl

diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
index 399dbb7..f186df7 100644
--- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
+++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
@@ -633,6 +633,7 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:MODEM_ERR
+     *   RadioError:REQUEST_NOT_SUPPORTED
      */
     void isNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info, in boolean isEnabled);
 

radio/aidl/vts/radio_network_test.cpp

diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index 43a4737..0e09b2c 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -1974,9 +1974,9 @@
     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::REQUEST_NOT_SUPPORTED,
+                                  RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
     LOG(DEBUG) << "setNullCipherAndIntegrityEnabled finished";
 }