tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "consumerir HAL uses "default" service name" am: 563665bc1f

Browse source 
am: 5b5e501526

Change-Id: I03366d18d53032dd228aa487ec97aa4eb2a79177
This commit is contained in:
Chris Phoenix 2017-01-19 17:15:57 +00:00 committed by android-build-merger
commit 3096f94546
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ir/1.0/default/ConsumerIr.cpp
View file

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

2
ir/1.0/default/service.cpp
View file

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