commit aa9589167bbbe255c1c6ba48bfd226ebb0dc69de
author Xin Li <delphij@google.com> Tue Mar 12 22:23:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 22:23:14 2019 -0700
tree fa9e460739c5a18975c5a19c8668b41a7180619b
parent ad4bf783ff136b8f0b4250bfde342f3d69614d6e
parent 2759a29eaa24cf3abfc646ac6f1a8182ce13fe25

[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: 35c5cd9139 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b2a4e6c90f014b15658292134e374f2b3802208

usbd/usbd.cpp

diff --git a/usbd/usbd.cpp b/usbd/usbd.cpp
index 41cd8dd..191fb92 100644
--- a/usbd/usbd.cpp
+++ b/usbd/usbd.cpp
@@ -22,15 +22,20 @@
 #include <android-base/properties.h>
 #include <android/hardware/usb/gadget/1.0/IUsbGadget.h>
 
+#include <hidl/HidlTransportSupport.h>
+
 #define PERSISTENT_USB_CONFIG "persist.sys.usb.config"
 
 using android::base::GetProperty;
 using android::base::SetProperty;
+using android::hardware::configureRpcThreadpool;
 using android::hardware::usb::gadget::V1_0::GadgetFunction;
 using android::hardware::usb::gadget::V1_0::IUsbGadget;
 using android::hardware::Return;
 
 int main(int /*argc*/, char** /*argv*/) {
+    configureRpcThreadpool(1, true /*callerWillJoin*/);
+
     android::sp<IUsbGadget> gadget = IUsbGadget::getService();
     Return<void> ret;