commit 4fb7ea52385754d96b11ad2c1934cb636e0c0845
author Connor O'Brien <connoro@google.com> Tue Dec 20 23:20:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 20 23:20:32 2016 +0000
tree 20c83720e5bb22038ead18e7de33951ba2731912
parent f938ff2124867d29bb1dab64dec1994408272f78
parent a6e34f36c04d31dacc2e3783fec29b8e4ec697cc

Merge "Fix Power VTS test setup code"

power/1.0/vts/functional/power_hidl_hal_test.cpp

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 8833c04..045a34b 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 @@
 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 {}