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

Commit 7b1af27e authored by Chris Phoenix's avatar Chris Phoenix
Browse files

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
parent 84660153

tv/input/1.0/default/TvInput.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }

}

tv/input/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>();

}

tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py

+0 −1
Original line number Diff line number Diff line
@@ -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")