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

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

Merge "consumerir HAL uses "default" service name" 

am: 563665bc

Change-Id: I25c9c8bb255477508948a9a862088a8fda344d5f
parents 1d51e903 563665bc

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>();

}