Merge commit '5bb9b8b' into nyc-dev-plus-aosp
diff --git a/device.mk b/device.mk
index 6c10fb0..b6ece56 100644
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,7 @@
PRODUCT_PACKAGES := \
libwpa_client \
hostapd \
+ wificond \
wpa_supplicant \
wpa_supplicant.conf
diff --git a/init.flounder.rc b/init.flounder.rc
index 324b797..469043c 100644
--- a/init.flounder.rc
+++ b/init.flounder.rc
@@ -203,7 +203,7 @@
oneshot
keycodes 114 115 116
-service p2p_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /system/bin/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/p2p_supplicant_overlay.conf \
-puse_p2p_group_interface=1p2p_device=1 \
@@ -221,15 +221,6 @@
socket gps seqpacket 0660 gps system
group system wakelock inet sdcard_rw sdcard_r
-service wpa_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
- class late_start
- socket wpa_wlan0 dgram 660 wifi wifi
- disabled
- oneshot
-
service kickstart /vendor/bin/qcks -i /vendor/firmware/mdm/image/ -r /data/qcks/mdm/
class late_start
disabled
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f53a333..d403ec2 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -116,5 +116,8 @@
# tlk_daemon
/vendor/bin/tlk_daemon u:object_r:tee_exec:s0
+# sysfs files used by wifi
+/sys/module/bcmdhd/parameters/firmware_path u:object_r:sysfs_wlan_fwpath:s0
+
# label the wifi MAC address
/sys/devices/platform/sdhci-tegra\.0/mmc_host/mmc1/mmc1:0001/mmc1:0001:2/net/wlan0/address u:object_r:sysfs_mac_address:s0
