Snap for 4551672 from 5e7e202c487380b232652128b2d94f8d9a7a87a6 to pi-release

Change-Id: I41179de854aff43f5376257a57e927eab1214c2e

7 files changed, 11 insertions, 13 deletions

diff --git a/installer/hikey/fip.bin b/installer/hikey/fip.bin
index 80fb1020..d5674028 100644
--- a/installer/hikey/fip.bin
+++ b/installer/hikey/fip.bin
diff --git a/installer/hikey/l-loader.bin b/installer/hikey/l-loader.bin
index ac42148e..d0954652 100644
--- a/installer/hikey/l-loader.bin
+++ b/installer/hikey/l-loader.bin
diff --git a/l-loader/recovery-fastboot.bin b/l-loader/recovery-fastboot.bin
index 193a1281..fe562622 100755
--- a/l-loader/recovery-fastboot.bin
+++ b/l-loader/recovery-fastboot.bin
diff --git a/manifest.xml b/manifest.xml
index 0c354d21..0971a191 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -45,6 +45,15 @@
         </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>
+    <hal format="hidl">
         <name>android.hardware.wifi.supplicant</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
diff --git a/sepolicy/hal_bluetooth_hikey.te b/sepolicy/hal_bluetooth_hikey.te
index 321f41d4..4a580499 100644
--- a/sepolicy/hal_bluetooth_hikey.te
+++ b/sepolicy/hal_bluetooth_hikey.te
@@ -1,5 +1,5 @@
 type hal_bluetooth_hikey, domain;
-type hal_bluetooth_hikey_exec, exec_type, file_type;
+type hal_bluetooth_hikey_exec, exec_type, vendor_file_type, file_type;
 
 hal_server_domain(hal_bluetooth_hikey, hal_bluetooth)
 
diff --git a/sepolicy/hci_attach.te b/sepolicy/hci_attach.te
index d87f4449..41f74cb8 100644
--- a/sepolicy/hci_attach.te
+++ b/sepolicy/hci_attach.te
@@ -1,5 +1,5 @@
 type hci_attach, domain;
-type hci_attach_exec, exec_type, file_type;
+type hci_attach_exec, exec_type, vendor_file_type, file_type;
 
 init_daemon_domain(hci_attach)
 
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;