summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2009-05-22 15:09:51 -0700
committerRobert Greenwalt <robdroid@android.com>2009-05-28 13:37:06 -0700
commitfc1b15cfbfc5f69235ec1f367abd7a909381cd05 (patch)
treeeeca713d5c9078989763d3777aafd41007a2846f /core
parent1cb62b83241c5d1cac9e9cda60d0d5d9218b44fb (diff)
downloadframeworks_base-fc1b15cfbfc5f69235ec1f367abd7a909381cd05.zip
frameworks_base-fc1b15cfbfc5f69235ec1f367abd7a909381cd05.tar.gz
frameworks_base-fc1b15cfbfc5f69235ec1f367abd7a909381cd05.tar.bz2
Fix wifi multicast API for public use.
Applying API review comments and taking it public.
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml7
-rw-r--r--core/res/res/values/strings.xml9
2 files changed, 16 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index fbaef5f..36f7dfb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -644,6 +644,13 @@
android:description="@string/permdesc_changeWifiState"
android:label="@string/permlab_changeWifiState" />
+ <!-- Allows applications to enter Wi-Fi Multicast mode -->
+ <permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
+ android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+ android:protectionLevel="dangerous"
+ android:description="@string/permdesc_changeWifiMulticastState"
+ android:label="@string/permlab_changeWifiMulticastState" />
+
<!-- Allows applications to discover and pair bluetooth devices -->
<permission android:name="android.permission.BLUETOOTH_ADMIN"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 8b2689b..e311abd 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1005,6 +1005,15 @@
configured Wi-Fi networks.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_changeWifiMulticastState">allow Wi-Fi Multicast
+ reception</string>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_changeWifiMulticastState">Allows an application to
+ receive packets not directly addressed to your device. This can be
+ useful when discovering services offered near by. It uses more power
+ than the non-multicast mode.</string>
+
+ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bluetoothAdmin">bluetooth administration</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bluetoothAdmin">Allows an application to configure