Convert GraphicsMapper Hal test to test against each of the service
names.
Bug:64203181
Test: vts-tradefed run vts -m VtsHalGraphicsMapperV2_0Target
Change-Id: Icbef0f0575183033c069d8ec097ab774207c40de
diff --git a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
index c534889..671c4b1 100644
--- a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
+++ b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
@@ -30,10 +30,12 @@
}
void Gralloc::init() {
- mAllocator = ::testing::VtsHalHidlTargetTestBase::getService<IAllocator>();
+ mAllocator = ::testing::VtsHalHidlTargetTestBase::getService<IAllocator>(
+ GraphicsMapperHidlEnvironment::Instance()->getServiceName<IAllocator>());
ASSERT_NE(nullptr, mAllocator.get()) << "failed to get allocator service";
- mMapper = ::testing::VtsHalHidlTargetTestBase::getService<IMapper>();
+ mMapper = ::testing::VtsHalHidlTargetTestBase::getService<IMapper>(
+ GraphicsMapperHidlEnvironment::Instance()->getServiceName<IMapper>());
ASSERT_NE(nullptr, mMapper.get()) << "failed to get mapper service";
ASSERT_FALSE(mMapper->isRemote()) << "mapper is not in passthrough mode";
}