diff options
| author | Martijn Coenen <maco@google.com> | 2012-04-06 13:47:52 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-04-20 11:10:58 -0700 |
| commit | 8099f5e7bfa7227ba674b5f0076f331e737bafd7 (patch) | |
| tree | 44d1942249ed12d1f0d91e25d2157f2054cc302d /res/values | |
| parent | a4e5a2b1e7fc398285e304caf7019572dce3d16f (diff) | |
| download | android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.tar.gz android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.tar.bz2 android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.zip | |
Additional changes to support Bluetooth Beam.
- Added a whitelist permission, to ensure only system
services (such as NFC) can whitelist MAC addresses.
- Added HANDOVER_STATUS permission, to ensure handover
transfer status can only be received by eligible services
(such as NFC).
- Added new confirmation type HANDOVER_CONFIRMED; this indicates
the transfer was initiated by a handover, and doesn't need to be
confirmed. This type is also reused to send broadcasts
to the NFC service, so the NFC service can show notifications
and deal with the received data.
- Added 15 second timeout to whitelist.
- Modify notication code to not show any notifications for handover
transfers; instead, send broadcasts to indicate handover status.
- Modify "transfer complete" code to sendbroasts to indicate handover
status.
Change-Id: I00c08e09eaf44f0bd4bd837cb6b0c37b802742bc
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 03d8324f2..f58543b4c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -32,6 +32,17 @@ <string name="permdesc_bluetoothShareManager">Allows the app to access the BluetoothShare manager and use it to transfer files. </string> + <string name="permlab_bluetoothWhitelist">Whitelist bluetooth device access.</string> + + <string name="permdesc_bluetoothWhitelist">Allows the app to temporarily whitelist + a Bluetooth device, allowing that device to send files to this device without user + confirmation.</string> + + <!-- Strings used for a (system only) permission --> + <string name="permlab_handoverStatus">Receive BT handover transfer broadcasts.</string> + <string name="permdesc_handoverStatus">Allows receiving handover transfer status + information from Bluetooth.</string> + <!-- string showed on "Share picutre via" dialog --> <string name="bt_share_picker_label">Bluetooth</string> |