diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-06 17:43:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-06 17:43:46 -0800 |
| commit | eba947a32a0233b3a2b384c580ab47bc7f27bb4d (patch) | |
| tree | 995b45b7625487bad3d025455e66951179e10a26 | |
| parent | d57fbe887fabd027e644caeaa2139c863143a786 (diff) | |
| parent | 35042f1f58663fd00a08e4a8dd51c59bfeddda78 (diff) | |
| download | frameworks_base-eba947a32a0233b3a2b384c580ab47bc7f27bb4d.zip frameworks_base-eba947a32a0233b3a2b384c580ab47bc7f27bb4d.tar.gz frameworks_base-eba947a32a0233b3a2b384c580ab47bc7f27bb4d.tar.bz2 | |
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 07a48e7..b83aea8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -86,7 +86,6 @@ <protected-broadcast android:name="android.hardware.action.USB_DISCONNECTED" /> <protected-broadcast android:name="android.hardware.action.USB_STATE" /> - <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" /> |