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 9094f3939d..d40f15aadb 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -18,7 +18,7 @@ void RadioHidlTest::SetUp() { radio = ::testing::VtsHalHidlTargetTestBase::getService( - hidl_string("rild")); + hidl_string(RADIO_SERVICE_NAME)); ASSERT_NE(radio, nullptr); radioRsp = new RadioResponse(*this); diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils.h b/radio/1.0/vts/functional/radio_hidl_hal_utils.h index 6826238618..51db87b08f 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils.h @@ -81,6 +81,7 @@ using ::android::hardware::Void; using ::android::sp; #define TIMEOUT_PERIOD 40 +#define RADIO_SERVICE_NAME "slot1" class RadioHidlTest; extern CardStatus cardStatus; diff --git a/radio/1.0/vts/functional/sap_hidl_hal_test.cpp b/radio/1.0/vts/functional/sap_hidl_hal_test.cpp index 88274cd7a9..02accef2e5 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_test.cpp @@ -18,7 +18,7 @@ void SapHidlTest::SetUp() { sap = ::testing::VtsHalHidlTargetTestBase::getService( - hidl_string("sap_uim_socket1")); + hidl_string(SAP_SERVICE_NAME)); ASSERT_NE(sap, nullptr); sapCb = new SapCallback(*this); diff --git a/radio/1.0/vts/functional/sap_hidl_hal_utils.h b/radio/1.0/vts/functional/sap_hidl_hal_utils.h index 2ee3c96d91..38fb003026 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/sap_hidl_hal_utils.h @@ -34,6 +34,7 @@ using ::android::hardware::Void; using ::android::sp; #define TIMEOUT_PERIOD 40 +#define SAP_SERVICE_NAME "slot1" class SapHidlTest;