commit cab71a015918f1dd43f179e50f95d8f63b2aacdc
author Martijn Coenen <maco@google.com> Fri Dec 30 12:22:51 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 30 12:22:53 2016 +0000
tree 11311b94430d702c27b140fdc8c000e58f435c03
parent 15d8519eee4741dd95c66d4f18b0a53cf58cf9a4
parent b7fca8a92cc843a56df08001c6592452ee8f635e

Merge "Fix call to configure threadpool."

wpa_supplicant/hidl/hidl.cpp

diff --git a/wpa_supplicant/hidl/hidl.cpp b/wpa_supplicant/hidl/hidl.cpp
index 09f09ce..d8988b9 100644
--- a/wpa_supplicant/hidl/hidl.cpp
+++ b/wpa_supplicant/hidl/hidl.cpp
@@ -8,8 +8,8 @@
  */
 
 #include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
 
+#include <hidl/HidlTransportSupport.h>
 #include "hidl_manager.h"
 
 extern "C" {
@@ -20,7 +20,7 @@
 #include "utils/includes.h"
 }
 
-using android::hardware::ProcessState;
+using android::hardware::configureRpcThreadpool;
 using android::hardware::IPCThreadState;
 using android::hardware::wifi::supplicant::V1_0::implementation::HidlManager;
 
@@ -44,7 +44,7 @@
 
 	wpa_printf(MSG_DEBUG, "Initing hidl control");
 
-	ProcessState::self()->setThreadPoolMaxThreadCount(0);
+	configureRpcThreadpool(1, true /* callerWillJoin */);
 	IPCThreadState::self()->disableBackgroundScheduling(true);
 	IPCThreadState::self()->setupPolling(&priv->hidl_fd);
 	if (priv->hidl_fd < 0)