From 5232d40757646683c26331cd7bad8b2cf6f2ca4e Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 9 Mar 2017 09:37:48 -0800 Subject: [PATCH] [AWARE] Enable Wi-Fi Aware feature support. Enable the Wi-Fi Aware feature on: - Add feature to framework - Device HAL feature Bug: 36088628 Test: integration (non-data-path) sl4a tests pass Change-Id: I3e2dca6477b27b466e2b074c70595813fe365973 --- BoardConfig.mk | 1 + device.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index d48869ed..b3ca7771 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -113,6 +113,7 @@ WIFI_DRIVER_FW_PATH_AP := "ap" WIFI_DRIVER_FW_PATH_P2P := "p2p" BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) +WIFI_HIDL_FEATURE_AWARE := true # Audio BOARD_USES_ALSA_AUDIO := true diff --git a/device.mk b/device.mk index 5ac198a6..9f5694f2 100644 --- a/device.mk +++ b/device.mk @@ -143,6 +143,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.wifi.aware.xml:system/etc/permissions/android.hardware.wifi.aware.xml \ frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \