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

Commit 0e522525 authored by Yifan Hong's avatar Yifan Hong
Browse files

IUsb 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: pass

Bug: 33844934
Change-Id: Ic04a7570c090d9d0a83bac1ec3f6d5ffe19e8923
parent caae0cc6

usb/1.0/default/service.cpp

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

usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp

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