Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c68beb87 authored by Chris Phoenix's avatar Chris Phoenix Committed by android-build-merger
Browse files

Merge "bootctrl HAL uses "default" service name" 

am: 9877cf29

Change-Id: If2f51ace994cc926bdd8e65afe11b708f7dab816
parents 7454a86f 9877cf29

boot/1.0/default/BootControl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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);

boot/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>();

}