summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2018-02-01 20:36:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-01 20:36:32 +0000
commitfd2cf49140f4a05e26c5c77f6e911daf9ed4a114 (patch)
tree617c1dbe4834c9671e4669b5f512fb7885798088
parentedba99cd8b329757bac760f0265c11137fb17297 (diff)
parent9b263b9f56e8a6d819bf9942a845fd1eb2d97926 (diff)
downloadhikey-fd2cf49140f4a05e26c5c77f6e911daf9ed4a114.tar.gz
hikey: Add wlan and p2p overlays to satisfy default wifi HAL am: 9dd7b9cd1c am: ab6de1524a
am: 9b263b9f56 Change-Id: If5b693d419b77cf64e570421ea1cf906a23e7ee8
-rw-r--r--device-common.mk4
-rw-r--r--p2p_supplicant_overlay.conf1
-rw-r--r--wpa_supplicant_overlay.conf3
3 files changed, 7 insertions, 1 deletions
diff --git a/device-common.mk b/device-common.mk
index 170c6d3e..4aefdbff 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -164,7 +164,9 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
- device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
+ device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
+ $(LOCAL_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+ $(LOCAL_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
# audio policy configuration
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/p2p_supplicant_overlay.conf b/p2p_supplicant_overlay.conf
new file mode 100644
index 00000000..acbace22
--- /dev/null
+++ b/p2p_supplicant_overlay.conf
@@ -0,0 +1 @@
+disable_scan_offload=1
diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf
new file mode 100644
index 00000000..e1f530db
--- /dev/null
+++ b/wpa_supplicant_overlay.conf
@@ -0,0 +1,3 @@
+disable_scan_offload=1
+p2p_disabled=1
+tdls_external_control=1