[NAN-AWARE] Rename NAN to Aware
Rename only (and any reformatting needed to pass lint) - no
functional changes!
(cherry-pick of commit f2a9e9978e0ad825d109b4c2114dce07e2e78f2c)
Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: I640fbf28b720909b60b8cfbba53da139af31afc5
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6c473f6..6c2a540 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -58,7 +58,7 @@
BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
WIFI_DRIVER_FW_PATH_STA := "sta"
WIFI_DRIVER_FW_PATH_AP := "ap"
-BOARD_HAS_NAN := true
+BOARD_HAS_AWARE := true
BOARD_USES_SECURE_SERVICES := true
diff --git a/device.mk b/device.mk
index fc99306..78a68af 100644
--- a/device.mk
+++ b/device.mk
@@ -102,7 +102,7 @@
frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
- frameworks/native/data/etc/android.hardware.wifi.nan.xml:system/etc/permissions/android.hardware.wifi.nan.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.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
