summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2018-08-13 10:20:40 +0530
committerAmit Pundir <amit.pundir@linaro.org>2018-08-13 12:39:58 +0530
commitdbe30cae1ef227860089e1840aeb1cd140c0003a (patch)
tree3837c8fc83f8a1aefdf659808d8dfa0dd737c70c
parentc500eb110e27d73a8a5d63117e9ec7f9a341fa5b (diff)
downloaddragonboard410c-dbe30cae1ef227860089e1840aeb1cd140c0003a.tar.gz
hostapd: Add HIDL interface and remove deprecated sepolicies
Add hostapd HIDL interface and remove deprecated hostapd sepolicies since AOSP no longer have a predefined hostapd domain and we run into "ERROR 'unknown type hostapd'" build error instead. Change-Id: I9181ba296976cfa1c194f3c551fe04f72f41a741 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--manifest.xml9
-rw-r--r--sepolicy/hostapd.te16
-rw-r--r--sepolicy/vendor_init.te1
3 files changed, 9 insertions, 17 deletions
diff --git a/manifest.xml b/manifest.xml
index 3a16d74..f3e838e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -134,4 +134,13 @@
<instance>default</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.wifi.hostapd</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IHostapd</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
</manifest>
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
deleted file mode 100644
index e0efa92..0000000
--- a/sepolicy/hostapd.te
+++ /dev/null
@@ -1,16 +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;
-
-# audit2allow
-allow hostapd sysfs_net:dir search;
-allow hostapd wifi_data_file:dir { add_name create setattr write remove_name };
-allow hostapd wifi_data_file:sock_file { create setattr unlink write };
diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor_init.te
index 733a112..33fffff 100644
--- a/sepolicy/vendor_init.te
+++ b/sepolicy/vendor_init.te
@@ -1,4 +1,3 @@
allow vendor_init {
- hostapd_socket
wifi_data_file
}:dir { create search getattr open read setattr ioctl write add_name remove_name rmdir relabelfrom };