diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-28 14:02:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-28 14:02:39 -0700 |
| commit | 1e2e44e900cb9a25d548e27a20d65292a7f321bc (patch) | |
| tree | c3bdd56e5c7457d252e499d4bf6afc31dd589411 /core | |
| parent | 59262c3f41688461b5884370013b1e242707cdd3 (diff) | |
| parent | fc1b15cfbfc5f69235ec1f367abd7a909381cd05 (diff) | |
| download | frameworks_base-1e2e44e900cb9a25d548e27a20d65292a7f321bc.zip frameworks_base-1e2e44e900cb9a25d548e27a20d65292a7f321bc.tar.gz frameworks_base-1e2e44e900cb9a25d548e27a20d65292a7f321bc.tar.bz2 | |
Merge change 2365 into donut
* changes:
Fix wifi multicast API for public use.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 |
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 |