From a6e34f36c04d31dacc2e3783fec29b8e4ec697cc Mon Sep 17 00:00:00 2001 From: Connor O'Brien Date: Tue, 20 Dec 2016 13:44:53 -0800 Subject: [PATCH] Fix Power VTS test setup code Bug: 33757678 Test: make vts; vts-tradefed run vts -m HalPowerHidlTargetTest Change-Id: Ia6d5073d7df858a5799270f364f989d7fc26690b Signed-off-by: Connor O'Brien --- power/1.0/vts/functional/power_hidl_hal_test.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/power/1.0/vts/functional/power_hidl_hal_test.cpp b/power/1.0/vts/functional/power_hidl_hal_test.cpp index 8833c04cea..045a34b1ff 100644 --- a/power/1.0/vts/functional/power_hidl_hal_test.cpp +++ b/power/1.0/vts/functional/power_hidl_hal_test.cpp @@ -35,18 +35,8 @@ using ::android::sp; class PowerHidlTest : public ::testing::Test { public: virtual void SetUp() override { - // TODO(b/33385836) Delete copied code - bool getStub = false; - char getSubProperty[PROPERTY_VALUE_MAX]; - if (property_get("vts.hidl.get_stub", getSubProperty, "") > 0) { - if (!strcmp(getSubProperty, "true") || !strcmp(getSubProperty, "True") || - !strcmp(getSubProperty, "1")) { - getStub = true; - } - } - power = IPower::getService("power", getStub); + power = IPower::getService("power"); ASSERT_NE(power, nullptr); - ASSERT_EQ(!getStub, power->isRemote()); } virtual void TearDown() override {}