diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp index 27d19cbf5c..e3e70042c4 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -43,8 +43,6 @@ void RadioHidlTest::SetUp() { EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); } -void RadioHidlTest::TearDown() {} - void RadioHidlTest::notify() { std::unique_lock lock(mtx); count++; diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h index a5e87016ac..6b95ab0d18 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h @@ -521,8 +521,6 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override; - virtual void TearDown() override; - /* Used as a mechanism to inform the test about data/event callback */ void notify(); diff --git a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp index c4bf1cc8ef..488da2d119 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp @@ -44,8 +44,6 @@ void RadioHidlTest_v1_1::SetUp() { EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); } -void RadioHidlTest_v1_1::TearDown() {} - void RadioHidlTest_v1_1::notify() { std::unique_lock lock(mtx); count++; diff --git a/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h b/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h index 523b9babe5..a081ab978d 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h +++ b/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h @@ -544,20 +544,12 @@ class RadioHidlTest_v1_1 : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override; - virtual void TearDown() override; - /* Used as a mechanism to inform the test about data/event callback */ void notify(); /* Test code calls this function to wait for response */ std::cv_status wait(int sec = TIMEOUT_PERIOD); - /* Used for checking General Errors */ - bool CheckGeneralError(); - - /* Used for checking OEM Errors */ - bool CheckOEMError(); - sp<::android::hardware::radio::V1_1::IRadio> radio_v1_1; sp radioRsp_v1_1; sp radioInd_v1_1;