Merge "[wpa_supplicant] Cumulative security patch for clearing keys" into pi-dev
am: 1bbc2f1635
Change-Id: I2333aa4490b382937b0d7efcf5684801ae94fcd9
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..6542bef
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+dimitrysh@google.com
+etancohen@google.com
+rpius@google.com
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index c802165..0224db1 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1084,7 +1084,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := hostapd_cli
-LOCAL_MODULE_TAGS := debug
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SHARED_LIBRARIES := libc libcutils liblog
LOCAL_CFLAGS := $(L_CFLAGS)
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;
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 4b2bd20..51ec414 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1678,7 +1678,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := wpa_cli
LOCAL_PROPRIETARY_MODULE := true
-LOCAL_MODULE_TAGS := debug
LOCAL_SHARED_LIBRARIES := libc libcutils liblog
LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_SRC_FILES := $(OBJS_c)