tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "bootctrl HAL uses "default" service name"

Browse source
This commit is contained in:
Chris Phoenix 2017-01-23 20:27:49 +00:00 committed by Android (Google) Code Review
commit 7f3f737a3e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot/1.0/default/BootControl.cpp
View file

@ -93,14 +93,14 @@ Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) {
}
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);

2
boot/1.0/default/service.cpp
View file

@ -22,5 +22,5 @@ using ::android::hardware::boot::V1_0::IBootControl;
using android::hardware::defaultPassthroughServiceImplementation;
int main (int /* argc */, char * /* argv */ []) {
return defaultPassthroughServiceImplementation<IBootControl>("bootctrl");
return defaultPassthroughServiceImplementation<IBootControl>();
}