hikey960: Switch hikey960 to use 4.14 by default am: 28461b4a0d am: 35d79a7be6
am: 7a7b5fd3fc
Change-Id: Ibfa1cecc473f8265f0d7f137a339e30ee4fafda2
diff --git a/device-common.mk b/device-common.mk
index e38e9c8..a99e15a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -56,7 +56,7 @@
PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh
# Add wifi-related packages
-PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd
+PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond
PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \
wifi.supplicant_scan_interval=15
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f241581..acdf91d 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -30,9 +30,6 @@
<!-- Separate software navigation bar required on this device. -->
<bool name="config_showNavigationBar">true</bool>
- <!-- Integer indicating the framework scan interval in milliseconds. -->
- <integer translatable="false" name="config_wifi_framework_scan_interval">10000</integer>
-
<!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
Please don't copy them, copy anything else. -->