summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-12-01 06:41:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-01 06:41:56 +0000
commit074e67a8a5a21e9facfd81611b76c547b92714fe (patch)
tree7dad58daf63a47c5079e6931e2c82388d9957f4c
parent69b86830a1630a4f1f86f1df3d2be49c29f90fd3 (diff)
parent44ea782285b00af2280cf74a3bc13657318e1cbf (diff)
downloadbullhead-074e67a8a5a21e9facfd81611b76c547b92714fe.tar.gz
Merge "wifi_supplicant: deprecate entropy.bin"
am: 44ea782285 Change-Id: Ib3af8d267c2d290151bfdff5bf297734665ed99c
-rw-r--r--init.bullhead.rc2
-rw-r--r--sepolicy/hostapd.te1
2 files changed, 1 insertions, 2 deletions
diff --git a/init.bullhead.rc b/init.bullhead.rc
index 4127607..4f43ade 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -351,7 +351,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
-puse_p2p_group_interface=1 \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+ -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
index 15064a0..fdf6f51 100644
--- a/sepolicy/hostapd.te
+++ b/sepolicy/hostapd.te
@@ -1,5 +1,4 @@
# hostapd can read and write WiFi related data and configuration.
-# For example, the entropy file is periodically updated.
allow hostapd wifi_data_file:file rw_file_perms;
r_dir_file(hostapd, wifi_data_file)