Merge "IUsb uses "default" service name"

This commit is contained in:
Yifan Hong
2017-03-20 17:51:09 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 5 deletions

View File

@@ -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<IUsb> service = new Usb();
configureRpcThreadpool(1, true /*callerWillJoin*/);
service->registerAsService(instance);
service->registerAsService();
ALOGI("USB HAL Ready.");
joinRpcThreadpool();

View File

@@ -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<IUsb>(USB_SERVICE_NAME);
usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>();
ASSERT_NE(usb, nullptr);
usb_cb_2 = new UsbCallback(*this, 2);