From 7b1af27ee0109ec911210f88b11bb1a8291a564c Mon Sep 17 00:00:00 2001 From: Chris Phoenix Date: Wed, 18 Jan 2017 18:53:15 -0800 Subject: [PATCH] TvInput 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: I6d152b95c39723c72f527c0767d2f3775e9a29f1 --- tv/input/1.0/default/TvInput.cpp | 5 +++-- tv/input/1.0/default/service.cpp | 2 +- .../vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tv/input/1.0/default/TvInput.cpp b/tv/input/1.0/default/TvInput.cpp index 6181ffb81c..4cd1d4062e 100644 --- a/tv/input/1.0/default/TvInput.cpp +++ b/tv/input/1.0/default/TvInput.cpp @@ -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; } } diff --git a/tv/input/1.0/default/service.cpp b/tv/input/1.0/default/service.cpp index d59c848b4b..d904d0b280 100644 --- a/tv/input/1.0/default/service.cpp +++ b/tv/input/1.0/default/service.cpp @@ -27,5 +27,5 @@ using android::hardware::tv::input::V1_0::ITvInput; using android::hardware::defaultPassthroughServiceImplementation; int main() { - return defaultPassthroughServiceImplementation("tv.input"); + return defaultPassthroughServiceImplementation(); } diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py index 9b490784a3..b5becd6a72 100644 --- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py +++ b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py @@ -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")