commit a64e2ad4da3612586594a19489a2b5d44f3f23a0
author Nick Pelly <npelly@google.com> Mon Mar 14 10:28:11 2011 -0700
committer Nick Pelly <npelly@google.com> Mon Mar 14 10:28:11 2011 -0700
tree 1c682135210ff543b511152425bc0406b754780d
parent 2d24213fca55fece8ce4a69a53abcd45983b0443
parent 38d0d5628d36bb1c2a8353a2b3e1a041e9e84652

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c684e7e..0c9a2ef 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -91,10 +91,15 @@
     <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
 
     <protected-broadcast android:name="android.nfc.action.LLCP_LINK_STATE_CHANGED" />
+    <protected-broadcast android:name="com.android.nfc_extras.action.RF_FIELD_ON_DETECTED" />
+    <protected-broadcast android:name="com.android.nfc_extras.action.RF_FIELD_OFF_DETECTED" />
+    <protected-broadcast android:name="com.android.nfc_extras.action.AID_SELECTED" />
+
     <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" />
     <protected-broadcast android:name="android.intent.action.CLEAR_DNS_CACHE" />
     <protected-broadcast android:name="android.intent.action.PROXY_CHANGE" />
 
+
     <!-- ====================================== -->
     <!-- Permissions for things that cost money -->
     <!-- ====================================== -->