commit c68beb871223b547c811714e18df6c61edeab2c4
author Chris Phoenix <cphoenix@google.com> Mon Jan 23 20:53:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 23 20:53:24 2017 +0000
tree 0a78b11f0fcb788b254ca73a84aed382b01e6650
parent 7454a86f2a69bed4478dec9e1d61388026c2da6c
parent 9877cf296f1697203f633694c196fd2ee22a6fbb

Merge "bootctrl HAL uses "default" service name"
am: 9877cf296f

Change-Id: If2f51ace994cc926bdd8e65afe11b708f7dab816

boot/1.0/default/BootControl.cpp

diff --git a/boot/1.0/default/BootControl.cpp b/boot/1.0/default/BootControl.cpp
index 5f4592f..83ee1d2 100644
--- a/boot/1.0/default/BootControl.cpp
+++ b/boot/1.0/default/BootControl.cpp
@@ -78,14 +78,14 @@
 }
 
 
-IBootControl* HIDL_FETCH_IBootControl(const char* hal) {
+IBootControl* HIDL_FETCH_IBootControl(const char* /* hal */) {
     int ret = 0;
     boot_control_module_t* module = NULL;
     hw_module_t **hwm = reinterpret_cast<hw_module_t**>(&module);
-    ret = hw_get_module(hal, const_cast<const hw_module_t**>(hwm));
+    ret = hw_get_module(BOOT_CONTROL_HARDWARE_MODULE_ID, const_cast<const hw_module_t**>(hwm));
     if (ret)
     {
-        ALOGE("hw_get_module %s failed: %d", hal, ret);
+        ALOGE("hw_get_module %s failed: %d", BOOT_CONTROL_HARDWARE_MODULE_ID, ret);
         return nullptr;
     }
     module->init(module);

boot/1.0/default/service.cpp

diff --git a/boot/1.0/default/service.cpp b/boot/1.0/default/service.cpp
index a594db6..247e40e 100644
--- a/boot/1.0/default/service.cpp
+++ b/boot/1.0/default/service.cpp
@@ -7,5 +7,5 @@
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main (int /* argc */, char * /* argv */ []) {
-    return defaultPassthroughServiceImplementation<IBootControl>("bootctrl");
+    return defaultPassthroughServiceImplementation<IBootControl>();
 }