From 806591aac84be88e052e24157bece78680d07a58 Mon Sep 17 00:00:00 2001 From: Pengquan Meng Date: Tue, 21 May 2019 11:54:14 -0700 Subject: [PATCH] Add Vts to enforce radioConfig is existed This vts enforce IRadioConfig is existed when IRadio service is supported. We didn't add IRadioConfigV1.2, so in this test IRadioConfigV1.1 will be checked. Bug: 132379735 Test: atest VtsHalRadioV1_4TargetTest Change-Id: I2062ed6b191193d9a8af4f25059fed6cc8dc09d8 --- radio/1.4/vts/functional/Android.bp | 4 +++- radio/1.4/vts/functional/radio_hidl_hal_test.cpp | 9 ++++++++- radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/radio/1.4/vts/functional/Android.bp b/radio/1.4/vts/functional/Android.bp index 2d0e0898b7..6827132948 100644 --- a/radio/1.4/vts/functional/Android.bp +++ b/radio/1.4/vts/functional/Android.bp @@ -31,7 +31,9 @@ cc_test { "android.hardware.radio@1.2", "android.hardware.radio@1.1", "android.hardware.radio@1.0", + "android.hardware.radio.config@1.0", + "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], test_suites: ["general-tests"] -} \ No newline at end of file +} diff --git a/radio/1.4/vts/functional/radio_hidl_hal_test.cpp b/radio/1.4/vts/functional/radio_hidl_hal_test.cpp index 4d80696c36..d2d21ce1f6 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.4/vts/functional/radio_hidl_hal_test.cpp @@ -47,6 +47,13 @@ void RadioHidlTest_v1_4::SetUp() { EXPECT_EQ(serial, radioRsp_v1_4->rspInfo.serial); EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error); + sp<::android::hardware::radio::config::V1_1::IRadioConfig> radioConfig = + ::testing::VtsHalHidlTargetTestBase::getService< + ::android::hardware::radio::config::V1_1::IRadioConfig>(); + + /* Enforce Vts tesing with RadioConfig is existed. */ + ASSERT_NE(nullptr, radioConfig.get()); + /* Enforce Vts Testing with Sim Status Present only. */ EXPECT_EQ(CardState::PRESENT, cardStatus.base.base.cardState); } @@ -84,4 +91,4 @@ void RadioHidlTest_v1_4::updateSimCardStatus() { serial = GetRandomSerialNumber(); radio_v1_4->getIccCardStatus(serial); EXPECT_EQ(std::cv_status::no_timeout, wait()); -} \ No newline at end of file +} diff --git a/radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h b/radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h index de7742c7ce..f662472d22 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h +++ b/radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h @@ -22,6 +22,8 @@ #include #include +#include + #include #include #include