commit b338d550d61ce63e96ca0383d1501a015a8981fe
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 25 05:41:55 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 25 05:41:55 2017 +0000
tree f7f6d652502f085e4acf3797cb3c24936a8d0ae5
parent bb51b95c54f9a48f81f0e12eab49001e65da032f
parent 487c24c14ad1bb3dcf1e006174c0e10a656e8491

Merge "power HAL uses "default" service name"

power/1.0/default/Power.cpp

diff --git a/power/1.0/default/Power.cpp b/power/1.0/default/Power.cpp
index 6233a14..2ddac0a 100644
--- a/power/1.0/default/Power.cpp
+++ b/power/1.0/default/Power.cpp
@@ -144,24 +144,24 @@
     return Void();
 }
 
-IPower* HIDL_FETCH_IPower(const char* name) {
+IPower* HIDL_FETCH_IPower(const char* /* name */) {
     int ret = 0;
     const hw_module_t* hw_module = NULL;
     power_module_t *power_module;
-    ret = hw_get_module(name, &hw_module);
+    ret = hw_get_module(POWER_HARDWARE_MODULE_ID, &hw_module);
     if (ret == 0 && hw_module->methods->open) {
-        ret = hw_module->methods->open(hw_module, name,
+        ret = hw_module->methods->open(hw_module, POWER_HARDWARE_MODULE_ID,
                 reinterpret_cast<hw_device_t**>(&power_module));
         if (ret == 0) {
             return new Power(power_module);
         }
         else {
-            ALOGE("Passthrough failed to load legacy HAL.");
+            ALOGE("Passthrough failed to load legacy power HAL.");
             return nullptr;
         }
     }
     else {
-        ALOGE ("hw_get_module %s failed: %d", name, ret);
+        ALOGE ("hw_get_module %s failed: %d", POWER_HARDWARE_MODULE_ID, ret);
         return nullptr;
     }
 }

power/1.0/default/service.cpp

diff --git a/power/1.0/default/service.cpp b/power/1.0/default/service.cpp
index f77ff5b..e8618b8 100644
--- a/power/1.0/default/service.cpp
+++ b/power/1.0/default/service.cpp
@@ -23,5 +23,5 @@
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    return defaultPassthroughServiceImplementation<IPower>("power");
+    return defaultPassthroughServiceImplementation<IPower>();
 }

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 36bdb0a..3f0ef56 100644
--- a/power/1.0/vts/functional/power_hidl_hal_test.cpp
+++ b/power/1.0/vts/functional/power_hidl_hal_test.cpp
@@ -35,7 +35,7 @@
 class PowerHidlTest : public ::testing::Test {
  public:
   virtual void SetUp() override {
-    power = IPower::getService("power");
+    power = IPower::getService();
     ASSERT_NE(power, nullptr);
   }