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

Commit 00854a3c authored by Chris Phoenix's avatar Chris Phoenix
Browse files

consumerir HAL uses "default" service name 

The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: I1b3b021aaa98ce99560126ddd277caa427ddf151
parent 84660153

ir/1.0/default/ConsumerIr.cpp

+3 −3
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ Return<void> ConsumerIr::getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) { 
}





IConsumerIr* HIDL_FETCH_IConsumerIr(const char *name) {

IConsumerIr* HIDL_FETCH_IConsumerIr(const char * /*name*/) {

    consumerir_device_t *dev;

    const hw_module_t *hw_module = NULL;



    int ret = hw_get_module(name, &hw_module);

    int ret = hw_get_module(CONSUMERIR_HARDWARE_MODULE_ID, &hw_module);

    if (ret != 0) {

        ALOGE("hw_get_module %s failed: %d", name, ret);

        ALOGE("hw_get_module %s failed: %d", CONSUMERIR_HARDWARE_MODULE_ID, ret);

        return nullptr;

    }

    ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &dev);

ir/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ using android::hardware::ir::V1_0::IConsumerIr; 
using android::hardware::defaultPassthroughServiceImplementation;



int main() {

    return defaultPassthroughServiceImplementation<IConsumerIr>("consumerir");

    return defaultPassthroughServiceImplementation<IConsumerIr>();

}