summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gralloc/gralloc_module.cpp1
-rw-r--r--gralloc960/gralloc_module_ion.cpp1
-rw-r--r--manifest.xml11
-rw-r--r--sepolicy/hostapd.te11
4 files changed, 12 insertions, 12 deletions
diff --git a/gralloc/gralloc_module.cpp b/gralloc/gralloc_module.cpp
index d0cb0809..38ed3dad 100644
--- a/gralloc/gralloc_module.cpp
+++ b/gralloc/gralloc_module.cpp
@@ -18,6 +18,7 @@
#include <errno.h>
#include <pthread.h>
+#include <string.h>
#include <cutils/log.h>
#include <cutils/atomic.h>
diff --git a/gralloc960/gralloc_module_ion.cpp b/gralloc960/gralloc_module_ion.cpp
index 9d3c4c8e..49a17a05 100644
--- a/gralloc960/gralloc_module_ion.cpp
+++ b/gralloc960/gralloc_module_ion.cpp
@@ -18,6 +18,7 @@
#include <errno.h>
#include <pthread.h>
+#include <string.h>
#include <cutils/log.h>
#include <cutils/atomic.h>
diff --git a/manifest.xml b/manifest.xml
index 61da9eb8..0971a191 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -45,10 +45,19 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.wifi.supplicant</name>
+ <name>android.hardware.wifi.hostapd</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
+ <name>IHostapd</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.wifi.supplicant</name>
+ <transport>hwbinder</transport>
+ <version>1.1</version>
+ <interface>
<name>ISupplicant</name>
<instance>default</instance>
</interface>
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
deleted file mode 100644
index 86b985ae..00000000
--- a/sepolicy/hostapd.te
+++ /dev/null
@@ -1,11 +0,0 @@
-# TODO(b/36657258): Remove data_between_core_and_vendor_violators once
-# hostapd no longer directly accesses /data outside /data/vendor.
-typeattribute hostapd data_between_core_and_vendor_violators;
-# hostapd can read and write WiFi related data and configuration.
-allow hostapd wifi_data_file:file rw_file_perms;
-r_dir_file(hostapd, wifi_data_file)
-
-# hostapd wants to create the directory holding its control socket.
-allow hostapd hostapd_socket:dir create_dir_perms;
-# hostapd needs to create, bind to, read, and write its control socket.
-allow hostapd hostapd_socket:sock_file create_file_perms;