wpa_supplicant: move control sockets to /data/vendor

Treble compliance.

Bug: 70228425
Bug: 70393317
Test: complete wifi test in b/70393317
Test: Test wifi on Taimen and Sailfish
Test: verify sockets exist in /data/vendor/wifi/wpa/sockets

Change-Id: I0bfc3a351419f0a03498e79664949f353369bf1b
This commit is contained in:
Jeff Vander Stoep
2018-01-24 08:57:13 -08:00
parent a43dba2e83
commit 4c05539d6c
2 changed files with 4 additions and 6 deletions

View File

@@ -283,8 +283,10 @@ on zygote-start
# Create the directories used by the Wireless subsystem
mkdir /data/misc/wifi 0770 wifi wifi
mkdir /data/misc/wifi/sockets 0770 wifi wifi
mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
mkdir /data/vendor/wifi 0770 wifi wifi
mkdir /data/vendor/wifi/wpa 0770 wifi wifi
mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
mkdir /data/misc/dhcp 0770 dhcp dhcp
chown dhcp dhcp /data/misc/dhcp
@@ -668,7 +670,7 @@ service vendor.tftp_server /vendor/bin/tftp_server
group root system
service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-O/data/misc/wifi/sockets -puse_p2p_group_interface=1 -dd \
-O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \
-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

View File

@@ -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;