commit f3ef4ffe8df1e005ca9bd58f3567ad4f17c9014d
author Hunsuk Choi <forestchoi@google.com> Tue Mar 29 03:10:35 2022 +0000
committer Hunsuk Choi <forestchoi@google.com> Sun Apr 24 12:28:09 2022 +0000
tree ddbb8f065780b1091cc3fbb3f4ee8bf544a6221b
parent f0c8d7a1e15bfa3acd068d1a72454572062562de

Update IRadioIms HAL

- Replace notifyImsTraffic with startImsTraffic and stopImsTraffic.
- Remove performAcbCheck and onAccessAllowed
- Remove REGISTERING from ImsRegistration.
- Replace FEATURE_ with IMS_MMTEL_CAPABILITY_ in ImsRegistration

Bug: 216387835
Test: build & flash
Change-Id: I19999ef54609c1027879201e792691ddaea48bd3

radio/aidl/vts/radio_ims_test.cpp

diff --git a/radio/aidl/vts/radio_ims_test.cpp b/radio/aidl/vts/radio_ims_test.cpp
index 52c5f02..84b7c6a 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -92,10 +92,10 @@
     serial = GetRandomSerialNumber();
 
     ImsRegistration regInfo;
-    regInfo.state = ImsRegistration::State::NOT_REGISTERED;
-    regInfo.ipcan = ImsRegistration::ImsAccessNetwork::NONE;
-    regInfo.reason = ImsRegistration::FailureReason::NONE;
-    regInfo.features = ImsRegistration::FEATURE_NONE;
+    regInfo.regState = ImsRegistrationState::NOT_REGISTERED;
+    regInfo.accessNetworkType = AccessNetwork::EUTRAN;
+    regInfo.reason = ImsFailureReason::NONE;
+    regInfo.capabilities = ImsRegistration::IMS_MMTEL_CAPABILITY_NONE;
 
     ndk::ScopedAStatus res =
             radio_ims->updateImsRegistrationInfo(serial, regInfo);
@@ -111,52 +111,53 @@
 }
 
 /*
- * Test IRadioIms.notifyImsTraffic() for the response returned.
+ * Test IRadioIms.startImsTraffic() for the response returned.
  */
-TEST_P(RadioImsTest, notifyImsTraffic) {
+TEST_P(RadioImsTest, startImsTraffic) {
     if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
-        ALOGI("Skipping notifyImsTraffic because ims is not supported in device");
+        ALOGI("Skipping startImsTraffic because ims is not supported in device");
         return;
     } else {
-        ALOGI("Running notifyImsTraffic because ims is supported in device");
+        ALOGI("Running startImsTraffic because ims is supported in device");
     }
 
     serial = GetRandomSerialNumber();
 
     ndk::ScopedAStatus res =
-            radio_ims->notifyImsTraffic(serial, 1, ImsTrafficType::REGISTRATION, false);
+            radio_ims->startImsTraffic(serial, std::string("1"),
+            ImsTrafficType::REGISTRATION, AccessNetwork::EUTRAN);
     ASSERT_OK(res);
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_ims->rspInfo.serial);
 
-    ALOGI("notifyImsTraffic, rspInfo.error = %s\n",
+    ALOGI("startImsTraffic, rspInfo.error = %s\n",
               toString(radioRsp_ims->rspInfo.error).c_str());
 
     verifyError(radioRsp_ims->rspInfo.error);
 }
 
 /*
- * Test IRadioIms.performAcbCheck() for the response returned.
+ * Test IRadioIms.stopImsTraffic() for the response returned.
  */
-TEST_P(RadioImsTest, performAcbCheck) {
+TEST_P(RadioImsTest, stopImsTraffic) {
     if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
-        ALOGI("Skipping performAcbCheck because ims is not supported in device");
+        ALOGI("Skipping stopImsTraffic because ims is not supported in device");
         return;
     } else {
-        ALOGI("Running performAcbCheck because ims is supported in device");
+        ALOGI("Running stopImsTraffic because ims is supported in device");
     }
 
     serial = GetRandomSerialNumber();
 
     ndk::ScopedAStatus res =
-            radio_ims->performAcbCheck(serial, 1, ImsTrafficType::REGISTRATION);
+            radio_ims->stopImsTraffic(serial, std::string("2"));
     ASSERT_OK(res);
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_ims->rspInfo.serial);
 
-    ALOGI("performAcbCheck, rspInfo.error = %s\n",
+    ALOGI("stopImsTraffic, rspInfo.error = %s\n",
               toString(radioRsp_ims->rspInfo.error).c_str());
 
     verifyError(radioRsp_ims->rspInfo.error);