commit f931672547b96986624dcec9101ddfc781b6533b
author Josh Gao <jmgao@google.com> Mon Apr 29 15:53:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 29 15:53:43 2019 -0700
tree 9054de153f2d330c4136fe698516691ecdad0550
parent ba6db284ad03653f8a42d8e4b233e719046d95fc
parent 27ea5ad245877514774f58bfbdc5e8b5aab3f270

Merge "adb: restore generation of public key in `adb keygen`."
am: fe6cc3e2d3

Change-Id: Ifaa0d70091189374c2294d021ede28d8786b5710

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;