summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-04-11 16:13:28 -0700
committerMartijn Coenen <maco@google.com>2012-04-20 11:13:25 -0700
commit226307d8c2952c42855005d7c0107b42b066bc9a (patch)
treee9fe14dc7817823b0bab3500eadca259db3cc102 /AndroidManifest.xml
parent9cf867ea8bc3d21d9ecb550c9b0e654f6b3fd9e1 (diff)
downloadpackages_apps_nfc-226307d8c2952c42855005d7c0107b42b066bc9a.zip
packages_apps_nfc-226307d8c2952c42855005d7c0107b42b066bc9a.tar.gz
packages_apps_nfc-226307d8c2952c42855005d7c0107b42b066bc9a.tar.bz2
Latest changes for Bluetooth Beam.
- Receive transfer notifications and status info from Bluetooth, to show progress using Notifications. - Added power manager, to keep track of BT power state, and turn BT off if possible. TODO: - UI for failed operations (ie transfer failed, Bluetooth enable failed). - Cleanup of transfer list - Make sure BT doesn't connect to other peripherals or isn't connectable. Change-Id: I31450f589bbaeb72ee8c450c5019f00f0190b7aa
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-xAndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 00c3733..c200e2c 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,8 @@
<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
+ <uses-permission android:name="com.android.permission.HANDOVER_STATUS" />
<application android:name=".NfcService"
android:icon="@drawable/icon"