| commit | dd37b9a46efd876eae74fb7c04f33145182866bf | [log] [tgz] |
|---|---|---|
| author | Guillaume Chelfi <chelfi@google.com> | Thu Feb 11 17:34:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 11 17:34:34 2021 +0000 |
| tree | d2461e874cbe9f4e60ed1f30b6bcccb9c1a83e08 | |
| parent | 09a3ba9a499bc85113b9cc71acc9c872f75812ca [diff] | |
| parent | b65cd1fc61d646b960011737dd4a1b04def66fa0 [diff] |
Merge "Fix overlooked reference during refactoring" into sc-dev am: b65cd1fc61 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13539281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5dbad930b98b265c03d8165fad62fe601efa280
diff --git a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp index ad4ef12..ea9bcb5 100644 --- a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp +++ b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
@@ -469,7 +469,7 @@ } } -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTestBase); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalNotStarted); INSTANTIATE_TEST_CASE_P( PerInstance, OffloadControlTestV1_0_HalNotStarted, testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames( @@ -478,7 +478,7 @@ IOffloadControl::descriptor))), android::hardware::PrintInstanceTupleNameToString<>); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlHidlTest); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OffloadControlTestV1_0_HalStarted); INSTANTIATE_TEST_CASE_P( PerInstance, OffloadControlTestV1_0_HalStarted, testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(