Merge "consumerir HAL uses "default" service name"
am: 563665bc1f
Change-Id: I25c9c8bb255477508948a9a862088a8fda344d5f
This commit is contained in:
commit
5b5e501526
2 changed files with 4 additions and 4 deletions
|
@ -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;
|
consumerir_device_t *dev;
|
||||||
const hw_module_t *hw_module = NULL;
|
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) {
|
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;
|
return nullptr;
|
||||||
}
|
}
|
||||||
ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &dev);
|
ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &dev);
|
||||||
|
|
|
@ -23,5 +23,5 @@ using android::hardware::ir::V1_0::IConsumerIr;
|
||||||
using android::hardware::defaultPassthroughServiceImplementation;
|
using android::hardware::defaultPassthroughServiceImplementation;
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
return defaultPassthroughServiceImplementation<IConsumerIr>("consumerir");
|
return defaultPassthroughServiceImplementation<IConsumerIr>();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue