commit ca421a6c70c38ff00e4b98bc9d126aca415c6767
author Sarah Chin <sarahchin@google.com> Fri Jan 28 15:54:36 2022 -0800
committer Sarah Chin <sarahchin@google.com> Fri Jan 28 15:56:10 2022 -0800
tree 2e516c926cc976006adfd5872dae5f180f5d7fd1
parent 19b4005495c9a4ff71aeadcd5ab8c58807b17728

Final API changes for IRadio

Remove CarrierRestrictions#priority
Move USSD from messaging -> voice
Rename DataProfileInfo#TYPE_THREE_GPP/2 -> TYPE_3GPP2
Remove neighboring CID APIs

Test: atest VtsHalRadioTargetTest
Bug: 199433581
Bug: 216688606
Change-Id: I621d99b8024f92709bcb675b667bcba678eede9b

radio/aidl/vts/radio_sim_test.cpp

diff --git a/radio/aidl/vts/radio_sim_test.cpp b/radio/aidl/vts/radio_sim_test.cpp
index 146e86c..64474c9 100644
--- a/radio/aidl/vts/radio_sim_test.cpp
+++ b/radio/aidl/vts/radio_sim_test.cpp
@@ -387,7 +387,6 @@
     carrierRestrictions.allowedCarriers[0].mnc = std::string("456");
     carrierRestrictions.allowedCarriers[0].matchType = Carrier::MATCH_TYPE_ALL;
     carrierRestrictions.allowedCarriers[0].matchData = std::string();
-    carrierRestrictions.priority = true;
     carrierRestrictions.allowedCarriersPrioritized = true;
     SimLockMultiSimPolicy multisimPolicy = SimLockMultiSimPolicy::NO_MULTISIM_POLICY;
 
@@ -650,12 +649,10 @@
 }
 
 /*
- * The following test is disabled due to b/109889468
- *
  * Test IRadioSim.getImsiForApp() for the response returned.
  */
-TEST_P(RadioSimTest, DISABLED_getImsiForApp) {
-    LOG(DEBUG) << "DISABLED_getImsiForApp";
+TEST_P(RadioSimTest, getImsiForApp) {
+    LOG(DEBUG) << "getImsiForApp";
     serial = GetRandomSerialNumber();
 
     // Check success returned while getting imsi for 3GPP and 3GPP2 apps only
@@ -679,7 +676,7 @@
             }
         }
     }
-    LOG(DEBUG) << "DISABLED_getImsiForApp finished";
+    LOG(DEBUG) << "getImsiForApp finished";
 }
 
 /*
@@ -723,8 +720,6 @@
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_sim->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_sim->rspInfo.serial);
-
-    // TODO(sanketpadawe): Add test for error code
     LOG(DEBUG) << "iccTransmitApduBasicChannel finished";
 }
 
@@ -775,8 +770,6 @@
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_sim->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_sim->rspInfo.serial);
-
-    // TODO(sanketpadawe): Add test for error code
     LOG(DEBUG) << "iccTransmitApduLogicalChannel finished";
 }