Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
am: c68beb8712

Change-Id: Ifd8aba7ab5deb077f6dfc596ce5c6ae92cf5dc73
This commit is contained in:
Chris Phoenix
2017-01-23 20:58:21 +00:00
committed by android-build-merger
parent 7eb2c69fa5 c68beb8712
commit f6835e18ef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,14 +78,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

@@ -7,5 +7,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>();
}