commit c83bce4cc9c073daa900b8af4b3525ad01e6d65e
author Sarah Chin <sarahchin@google.com> Wed Dec 29 00:35:12 2021 -0800
committer Sarah Chin <sarahchin@google.com> Tue Jan 04 21:06:30 2022 +0000
tree 3d62e52bafd44f0431d8b2aa79cf41961721e23e
parent 6d8e49a05e97924b687d0d8114470b36c5fde29c

Finish IRadio 1.6/IRadioConfig 1.3 AIDL VTS

Implement IRadioConfig VTS and helper methods
Verify that VtsHalRadioTargetTest passes

Bug: 210712359
Test: atest VtsHalRadioTargetTest
Change-Id: Ic82ffd2feacc107e9b291ef3aab861d0c1496489

radio/aidl/vts/radio_data_test.cpp

diff --git a/radio/aidl/vts/radio_data_test.cpp b/radio/aidl/vts/radio_data_test.cpp
index 87521cc..8547e9d 100644
--- a/radio/aidl/vts/radio_data_test.cpp
+++ b/radio/aidl/vts/radio_data_test.cpp
@@ -46,12 +46,17 @@
 
     radio_data->setResponseFunctions(radioRsp_data, radioInd_data);
 
+    // Assert IRadioSim exists and SIM is present before testing
+    radio_sim = sim::IRadioSim::fromBinder(ndk::SpAIBinder(
+            AServiceManager_waitForService("android.hardware.radio.sim.IRadioSim/slot1")));
+    ASSERT_NE(nullptr, radio_sim.get());
+    updateSimCardStatus();
+    EXPECT_EQ(CardStatus::STATE_PRESENT, cardStatus.cardState);
+
     // Assert IRadioConfig exists before testing
-    std::shared_ptr<aidl::android::hardware::radio::config::IRadioConfig> radioConfig =
-            aidl::android::hardware::radio::config::IRadioConfig::fromBinder(
-                    ndk::SpAIBinder(AServiceManager_waitForService(
-                            "android.hardware.radio.config.IRadioConfig/default")));
-    ASSERT_NE(nullptr, radioConfig.get());
+    radio_config = config::IRadioConfig::fromBinder(ndk::SpAIBinder(
+            AServiceManager_waitForService("android.hardware.radio.config.IRadioConfig/default")));
+    ASSERT_NE(nullptr, radio_config.get());
 }
 
 ndk::ScopedAStatus RadioDataTest::getDataCallList() {