From 46173d228afe263425f435cb9d5dd8e0fc09816e Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 19 Jan 2012 21:15:33 +0530 Subject: get wifi bt menu under settings Get wifi and bluetooth menu under "Settings" and move common configuration files i.e wpa_supplicant.conf and android.hardware.bluetooth.xml to device/linaro/common Change-Id: I16b5d2a0958d9f5995e0647e1ebbf7d004948acb Signed-off-by: Amit Pundir --- device.mk | 6 +++++- wpa_supplicant.conf | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100755 wpa_supplicant.conf diff --git a/device.mk b/device.mk index f528722..f7faa76 100644 --- a/device.mk +++ b/device.mk @@ -15,7 +15,7 @@ PRODUCT_COPY_FILES := \ device/linaro/origen/vold.fstab:system/etc/vold.fstab \ device/linaro/origen/egl.cfg:system/lib/egl/egl.cfg \ - device/linaro/origen/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf + device/linaro/common/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf PRODUCT_COPY_FILES += \ device/linaro/origen/init.rc:root/init.rc \ @@ -26,6 +26,10 @@ PRODUCT_COPY_FILES += \ device/linaro/origen/unidisplay_ts.idc:system/usr/idc/unidisplay_ts.idc \ device/linaro/common/wallpaper_info.xml:data/system/wallpaper_info.xml +PRODUCT_COPY_FILES += \ + frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + device/linaro/common/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml + PRODUCT_PROPERTY_OVERRIDES := \ hwui.render_dirty_regions=false diff --git a/wpa_supplicant.conf b/wpa_supplicant.conf deleted file mode 100755 index a08eb33..0000000 --- a/wpa_supplicant.conf +++ /dev/null @@ -1,6 +0,0 @@ -##### wpa_supplicant configuration file template ##### -update_config=1 -ctrl_interface=wlan0 -eapol_version=1 -ap_scan=1 -fast_reauth=1 -- cgit v1.2.3