commit bf8e596748a60a1aa365178f1f7fe160dd08f879
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 12 17:57:24 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 12 17:57:24 2018 +0000
tree fd8d8342f6d869f381d72bbf62ba845f53485937
parent e639d33824e721c6e51f39fa7557721b84a6655a
parent 3667a284659e9c5a9fd130af57c6ee1f244cc812

[automerger] Create a hostapd build target without the HIDL am: 05c7f27079 am: 3667a28465

Change-Id: Ie4fe2096771281d7a0c420f3a731379eafe65415

hostapd/hidl/1.0/hidl.cpp

diff --git a/hostapd/hidl/1.0/hidl.cpp b/hostapd/hidl/1.0/hidl.cpp
index 1f80c7d..a0dc50e 100644
--- a/hostapd/hidl/1.0/hidl.cpp
+++ b/hostapd/hidl/1.0/hidl.cpp
@@ -40,7 +40,6 @@
 {
 	wpa_printf(MSG_DEBUG, "Initing hidl control");
 
-	IPCThreadState::self()->disableBackgroundScheduling(true);
 	IPCThreadState::self()->setupPolling(&hidl_fd);
 	if (hidl_fd < 0)
 		goto err;

src/eap_peer/eap_proxy_qmi_oc.c

diff --git a/src/eap_peer/eap_proxy_qmi_oc.c b/src/eap_peer/eap_proxy_qmi_oc.c
index 4c07da5..9fcf512 100644
--- a/src/eap_peer/eap_proxy_qmi_oc.c
+++ b/src/eap_peer/eap_proxy_qmi_oc.c
@@ -32,7 +32,7 @@
 
 #ifdef CONFIG_EAP_PROXY
 #include "qmi_client.h"
-#include "eap_proxy_qmi.h"
+#include "eap_proxy_qmi_oc.h"
 #include "qmi_client.h"
 #include "qmi_idl_lib.h"
 #include "authentication_service_v01.h"