summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-07 17:45:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-07 17:45:01 -0700
commit3e0a3ec1d0e71e0fefc87c74d5713f70d3e4ef91 (patch)
tree1e9cc48f512c86d7c70a3f6078301b4b2db51d06
parente1e59a547fd3ac6330013b11696f08d8f2ce5705 (diff)
parentca221e2d7aa1960cdb0479d127f21e396ed64a4e (diff)
downloaddevice_samsung_tuna-3e0a3ec1d0e71e0fefc87c74d5713f70d3e4ef91.zip
device_samsung_tuna-3e0a3ec1d0e71e0fefc87c74d5713f70d3e4ef91.tar.gz
device_samsung_tuna-3e0a3ec1d0e71e0fefc87c74d5713f70d3e4ef91.tar.bz2
Merge "enable wifi p2p system feature"
-rw-r--r--device.mk1
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml3
2 files changed, 1 insertions, 3 deletions
diff --git a/device.mk b/device.mk
index fad4ac7..25487a2 100644
--- a/device.mk
+++ b/device.mk
@@ -100,6 +100,7 @@ PRODUCT_COPY_FILES += \
frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+ frameworks/base/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/base/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6e04335..7600077 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -171,9 +171,6 @@
<!-- Boolean indicating whether the wifi chipset has background scan support -->
<bool translatable="false" name="config_wifi_background_scan_support">true</bool>
- <!-- Boolean indicating whether the wifi chipset has wifi direct support -->
- <bool translatable="false" name="config_wifi_p2p_support">true</bool>
-
<bool name="config_ui_enableFadingMarquee">false</bool>
<!-- Component name of the service providing network location support. -->