summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-07-22 15:16:58 -0500
committerJeff Hamilton <jham@android.com>2011-07-26 16:11:15 -0500
commitd2d5dddf17ac2008547172cd72faa034a89d569b (patch)
treecaa6d552626a3285b7518d3895974ba06bdcf893 /AndroidManifest.xml
parent09a978f1e8869341029913fe8502cdcc9b9dd6a9 (diff)
downloadpackages_apps_nfc-d2d5dddf17ac2008547172cd72faa034a89d569b.zip
packages_apps_nfc-d2d5dddf17ac2008547172cd72faa034a89d569b.tar.gz
packages_apps_nfc-d2d5dddf17ac2008547172cd72faa034a89d569b.tar.bz2
Play an animation for outbound NFC P2P.
Clean up NFC service sound playing. Cancel P2P tasks when the LLCP link is broken. Bug: 4941390 Change-Id: I0710bc7dd9d09ed47a540cb4739890bcc3a4f905
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 9c46348..e0cf2de 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,6 +16,8 @@
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<permission android:name="com.android.nfc.permission.NFCEE_ADMIN"
android:label="@string/permlab_nfcAdmin"