Merge "Update Radio and Sap service name in VTS." am: f7c337546a

am: ff75143a7a

Change-Id: I76b9a4c0b1fde16109d5209254060204381ec1dc
This commit is contained in:
Sanket Padawe
2017-04-12 17:19:51 +00:00
committed by android-build-merger
4 changed files with 4 additions and 2 deletions

View File

@@ -18,7 +18,7 @@
void RadioHidlTest::SetUp() {
radio = ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(
hidl_string("rild"));
hidl_string(RADIO_SERVICE_NAME));
ASSERT_NE(radio, nullptr);
radioRsp = new RadioResponse(*this);

View File

@@ -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;

View File

@@ -18,7 +18,7 @@
void SapHidlTest::SetUp() {
sap = ::testing::VtsHalHidlTargetTestBase::getService<ISap>(
hidl_string("sap_uim_socket1"));
hidl_string(SAP_SERVICE_NAME));
ASSERT_NE(sap, nullptr);
sapCb = new SapCallback(*this);

View File

@@ -34,6 +34,7 @@ using ::android::hardware::Void;
using ::android::sp;
#define TIMEOUT_PERIOD 40
#define SAP_SERVICE_NAME "slot1"
class SapHidlTest;