summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-08-29 17:36:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-29 17:36:50 -0700
commitf99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89 (patch)
tree43fe26446e92612d32298ca0ad2667594b3db874 /core
parent30cca6020df6fede4043a9f6715be470d3132c57 (diff)
parent9322687d98ec425da03cc10ab64ea19ad7fe2d69 (diff)
downloadframeworks_base-f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89.zip
frameworks_base-f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89.tar.gz
frameworks_base-f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89.tar.bz2
Merge "Initialize p2p settings"
Diffstat (limited to 'core')
-rwxr-xr-xcore/res/res/values/config.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b155b80..051ed14 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -189,6 +189,9 @@
<!-- Boolean indicating whether the wifi chipset has p2p support -->
<bool translatable="false" name="config_wifi_p2p_support">false</bool>
+ <!-- Device type information conforming to Annex B format in WiFi Direct specification.
+ The default represents a dual-mode smartphone -->
+ <string translatable="false" name="config_wifi_p2p_device_type">10-0050F204-5</string>
<!-- Boolean indicating whether the wifi chipset supports background scanning mechanism.
This mechanism allows the host to remain in suspend state and the dongle to actively