summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-08-03 15:39:59 -0700
committerChia-chi Yeh <chiachi@android.com>2011-08-03 15:52:12 -0700
commitfcc1b41b663c1a0cb551344c4a16a5ad9ce36d60 (patch)
tree348f18a4ff0f2c2dccb84b3ea486aed0764d49ab /core/res/AndroidManifest.xml
parente5750a344a9c1a83a63d5119d39d2ea4897bc312 (diff)
downloadframeworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.zip
frameworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.tar.gz
frameworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.tar.bz2
VPN: move away from the VPN permission.
VpnBuilder will be replaced by VpnService in the next change. Change-Id: I2dea67a1616b74d17b372f7b214d207f1617198e
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index f99a94c..19a25cc 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -393,14 +393,6 @@
android:description="@string/permdesc_nfc"
android:label="@string/permlab_nfc" />
- <!-- Allows applications to provide VPN functionality.
- @hide Pending API council approval -->
- <permission android:name="android.permission.VPN"
- android:permissionGroup="android.permission-group.NETWORK"
- android:protectionLevel="dangerous"
- android:description="@string/permdesc_vpn"
- android:label="@string/permlab_vpn" />
-
<!-- Allows an application to use SIP service -->
<permission android:name="android.permission.USE_SIP"
android:permissionGroup="android.permission-group.NETWORK"