summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-10-12 13:00:50 -0700
committerNick Pelly <npelly@google.com>2010-10-12 18:37:26 -0700
commit590b73bc5b8e5f7b59bff1d9264a52388a5162e6 (patch)
tree113139d8fd0d2b8a0e319e9f766e180a0f1e084f /core/res/AndroidManifest.xml
parent45738f6700cff689eacda7c8192b76939ba20591 (diff)
downloadframeworks_base-590b73bc5b8e5f7b59bff1d9264a52388a5162e6.zip
frameworks_base-590b73bc5b8e5f7b59bff1d9264a52388a5162e6.tar.gz
frameworks_base-590b73bc5b8e5f7b59bff1d9264a52388a5162e6.tar.bz2
NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 43eeda8..ff079e4 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -86,9 +86,10 @@
<protected-broadcast android:name="android.hardware.action.USB_DISCONNECTED" />
<protected-broadcast android:name="android.hardware.action.USB_STATE" />
- <protected-broadcast android:name="com.trustedlogic.trustednfc.android.action.NDEF_TAG_DISCOVERED" />
- <protected-broadcast android:name="com.trustedlogic.trustednfc.android.action.TRANSACTION_DETECTED" />
- <protected-broadcast android:name="com.trustedlogic.trustednfc.android.action.LLCP_LINK_STATE_CHANGED" />
+ <protected-broadcast android:name="android.nfc.action.NDEF_TAG_DISCOVERED" />
+ <protected-broadcast android:name="android.nfc.action.TAG_DISCOVERED" />
+ <protected-broadcast android:name="android.nfc.action.LLCP_LINK_STATE_CHANGED" />
+ <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" />
<!-- ====================================== -->
<!-- Permissions for things that cost money -->