commit c1a127e9e0f671343eb115ea02b297e1451af333
author Yomna Nasser <yomna@google.com> Wed Jan 04 03:25:55 2023 +0000
committer Jayachandran C <jayachandranc@google.com> Thu Jan 05 20:29:43 2023 +0000
tree c54f000592d4b07d362361dc939e207a207904d3
parent 32488fc30d92fdb233c68dfba9bc310a00fa5d32

Update setNullCipherAndIntegrityEnabled API.

Additionally update isNullCipherAndIntegrityEnabled VTS to reflect the same.

Bug: b/237529943
Test: m
Change-Id: I816bccb87d3ce4f89fb81eecdd9b040c91484847

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 fa1badb..457b5b9 100644
--- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
+++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
@@ -622,6 +622,7 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:MODEM_ERR
+     *   RadioError:REQUEST_NOT_SUPPORTED
      */
     void setNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info);
 

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 658fcf7..3d6dbe7 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -2021,8 +2021,8 @@
     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}));
     LOG(DEBUG) << "isNullCipherAndIntegrityEnabled finished";
 }