diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-06-17 16:43:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 16:43:44 -0700 |
| commit | 941ed30638e42bbae32a270511d3c2716307c767 (patch) | |
| tree | 1190b67ecbc154ed7f34acdb5328dde60784921d /core | |
| parent | ec08cacd78c4b746ac385c874f41833fc06ebc2f (diff) | |
| parent | 3f3337a662e9916bbf14502ef3b32dedaa7adfa4 (diff) | |
| download | frameworks_base-941ed30638e42bbae32a270511d3c2716307c767.zip frameworks_base-941ed30638e42bbae32a270511d3c2716307c767.tar.gz frameworks_base-941ed30638e42bbae32a270511d3c2716307c767.tar.bz2 | |
Merge "VPN: avoid leaking file descriptors."
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a8aff37..47902a8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -91,6 +91,8 @@ <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> + <protected-broadcast android:name="android.net.vpn.action.REVOKED" /> + <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" /> |