summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-03-16 13:23:30 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-03-16 16:23:17 -0700
commit283943423148387512f7f08b1db7175695392ab8 (patch)
treeef86c40a2941f5e8c58735bb753f8c441a89eaf4
parent41dcc3a64183d28c2b17d15a3abf490dc7dba4da (diff)
downloadhikey-283943423148387512f7f08b1db7175695392ab8.tar.gz
hikey: Clean wifi-related settings
Change-Id: Ibec66972a34d43cd69f43f0b3a73ad7fe35438e5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--device.mk7
-rw-r--r--init.hikey.rc16
2 files changed, 6 insertions, 17 deletions
diff --git a/device.mk b/device.mk
index 77c71236..bda7ebf7 100644
--- a/device.mk
+++ b/device.mk
@@ -39,7 +39,12 @@ $(call inherit-product-if-exists, device/linaro/hikey-kernel/modules/wifi/wifi.m
DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
# Add openssh support for remote debugging and job submission
-PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim wpa_supplicant
+PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim
+
+# Add wifi-related packages
+PRODUCT_PACKAGES += libwpa_client wpa_supplicant
+PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \
+ wifi.supplicant_scan_interval=15
# Build and run only ART
PRODUCT_RUNTIMES := runtime_libart_default
diff --git a/init.hikey.rc b/init.hikey.rc
index 937cb5c5..38d6bb4c 100644
--- a/init.hikey.rc
+++ b/init.hikey.rc
@@ -4,12 +4,6 @@ on init
# mount debugfs
mount debugfs /sys/kernel/debug /sys/kernel/debug
- setprop wifi.interface wlan0
-
- # Set this property so AdvancedWifiSettings would show the checkbox
- # for Enable/Disable Active Roaming
- setprop ro.wifi.active_roaming.enable true
-
# disable transparent huge pages
write /sys/kernel/mm/transparent_hugepage/enabled "never"
@@ -17,7 +11,6 @@ on init
symlink /sdcard /mnt/sdcard
symlink /sdcard /storage/sdcard0
-
# Disabled virtual memory randomization
# (if randomization is enabled the AEM-JIT will have a lower cache hit rate)
write /proc/sys/kernel/randomize_va_space 0
@@ -34,11 +27,6 @@ on fs
on post-fs-data
mkdir /data/media 0770 media_rw media_rw
mkdir /data/misc/gatord 0700 root root
- mkdir /data/misc/wireless 0771 system system
- mkdir /data/misc/wifi 0771 wifi wifi
- mkdir /data/misc/wifi/sockets 0771 wifi wifi
- mkdir /data/misc/wifi/wapi_certs 0777 wifi wifi
- mkdir /data/misc/dhcp 0770 dhcp dhcp
# Set SELinux security contexts for files used by lava.
restorecon_recursive /data/local/tmp/lava
@@ -84,10 +72,6 @@ on post-fs
# enable test harness
setprop ro.test_harness true
- # Setup paths used for socket communication with the dhcp daemon (dhcpd)
- mkdir /data/misc/dhcp 0770 dhcp dhcp
- chown dhcp dhcp /data/misc/dhcp
-
on property:usb_speed.switch=high
write /sys/kernel/debug/f72c0000.usb/config "0"