diff --git a/usb/1.0/default/service.cpp b/usb/1.0/default/service.cpp index b4db241447..4605a4c143 100644 --- a/usb/1.0/default/service.cpp +++ b/usb/1.0/default/service.cpp @@ -28,12 +28,11 @@ using android::hardware::usb::V1_0::IUsb; using android::hardware::usb::V1_0::implementation::Usb; int main() { - const char instance[] = "usb_hal"; android::sp service = new Usb(); configureRpcThreadpool(1, true /*callerWillJoin*/); - service->registerAsService(instance); + service->registerAsService(); ALOGI("USB HAL Ready."); joinRpcThreadpool(); diff --git a/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp b/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp index 54db8c2bf1..ea6d4a9ba9 100644 --- a/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp +++ b/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp @@ -47,8 +47,6 @@ using ::android::hardware::Return; using ::android::hardware::Void; using ::android::sp; -#define USB_SERVICE_NAME "usb_hal" - // The main test class for the USB hidl HAL class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: @@ -97,7 +95,7 @@ class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase { virtual void SetUp() override { ALOGI("Setup"); - usb = ::testing::VtsHalHidlTargetTestBase::getService(USB_SERVICE_NAME); + usb = ::testing::VtsHalHidlTargetTestBase::getService(); ASSERT_NE(usb, nullptr); usb_cb_2 = new UsbCallback(*this, 2);