summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-01-31 17:23:47 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-01-31 17:23:47 +0000
commitee0c162bd2ce163f8d634b3eeac40b515a32872a (patch)
treed036c59ce36c863d631cd47afa1b89f0d03e01c1
parentd75d144fb8f0516ef9b2c9e67f5e349337c7fd88 (diff)
parentc4523d22ac9653d52192967e44085a252ef22b4b (diff)
downloadhikey-ee0c162bd2ce163f8d634b3eeac40b515a32872a.tar.gz
Snap for 4577102 from c4523d22ac9653d52192967e44085a252ef22b4b to pi-release
Change-Id: I9cc7999863cac993592d04f305055bf60f5ee571
-rw-r--r--device-common.mk1
-rw-r--r--init.common.rc5
-rw-r--r--sepolicy/hal_wifi_supplicant_default.te4
3 files changed, 6 insertions, 4 deletions
diff --git a/device-common.mk b/device-common.mk
index 56fedc0e..170c6d3e 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -161,6 +161,7 @@ $(call inherit-product-if-exists, device/linaro/hikey/wpan/ti-wpan-products.mk)
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+ frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
diff --git a/init.common.rc b/init.common.rc
index 9feaaccc..81afbadc 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -61,6 +61,11 @@ on post-fs-data
# Set SELinux security contexts for files used by lava.
restorecon_recursive /data/local/tmp/lava
+on zygote-start
+ mkdir /data/vendor/wifi 0770 wifi wifi
+ mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+ mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+
on property:sys.boot_completed=1
# update cpuset now that processors are up
# Foreground should contain most cores (7 is reserved for top-app)
diff --git a/sepolicy/hal_wifi_supplicant_default.te b/sepolicy/hal_wifi_supplicant_default.te
index 3646bac8..c657db53 100644
--- a/sepolicy/hal_wifi_supplicant_default.te
+++ b/sepolicy/hal_wifi_supplicant_default.te
@@ -4,7 +4,3 @@ typeattribute hal_wifi_supplicant_default data_between_core_and_vendor_violators
allow hal_wifi_supplicant_default wifi_data_file:dir create_dir_perms;
allow hal_wifi_supplicant_default wifi_data_file:file create_file_perms;
-
-# Create a socket for receiving info from wpa
-allow hal_wifi_supplicant_default wpa_socket:dir create_dir_perms;
-allow hal_wifi_supplicant_default wpa_socket:sock_file create_file_perms;