Merge "TvInput HAL uses "default" service name"

This commit is contained in:
Chris Phoenix
2017-01-20 23:17:14 +00:00
committed by Android (Google) Code Review
3 changed files with 4 additions and 4 deletions

View File

@@ -196,7 +196,7 @@ bool TvInput::isSupportedStreamType(int type) {
return type != TV_STREAM_TYPE_BUFFER_PRODUCER;
}
ITvInput* HIDL_FETCH_ITvInput(const char* name) {
ITvInput* HIDL_FETCH_ITvInput(const char* /* name */) {
int ret = 0;
const hw_module_t* hw_module = nullptr;
tv_input_device_t* input_device;
@@ -213,7 +213,8 @@ ITvInput* HIDL_FETCH_ITvInput(const char* name) {
}
}
else {
LOG(ERROR) << "hw_get_module " << name << " failed: " << ret;
LOG(ERROR) << "hw_get_module " << TV_INPUT_HARDWARE_MODULE_ID
<< " failed: " << ret;
return nullptr;
}
}

View File

@@ -27,5 +27,5 @@ using android::hardware::tv::input::V1_0::ITvInput;
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
return defaultPassthroughServiceImplementation<ITvInput>("tv.input");
return defaultPassthroughServiceImplementation<ITvInput>();
}

View File

@@ -39,7 +39,6 @@ class TvInputHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
target_version=1.0,
target_package="android.hardware.tv.input",
target_component_name="ITvInput",
hw_binder_service_name="tv-input-1-0",
bits=64 if self.dut.is64Bit else 32)
self.dut.shell.InvokeTerminal("one")