commit 92403384d20565b66b7b5f421b49f2902f3a541b
author Colin Cross <ccross@android.com> Fri Mar 29 17:41:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 29 17:41:05 2019 -0700
tree ae9528f11b87151816c083f268eecc17104ecec9
parent 8da0b0a44f7f9915b4033550cdcefca688887c7a
parent 704d76a00afe7463f05b730241b23860a9cdb444

Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: b5fc0cb2f3 am: 3455f409f1
am: 704d76a00a

Change-Id: Ieddaa83faf9166329a39b55b4b16e0897c6bdca4

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 525ae8d..938322c 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
 

overlay/frameworks/base/core/res/res/values/config.xml

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. -->