commit 9f67adfc2d33ef63960d2e528ccbcbdea621f969
author Chia-chi Yeh <chiachi@android.com> Fri May 13 15:27:40 2011 -0700
committer Chia-chi Yeh <chiachi@android.com> Mon May 16 15:16:58 2011 -0700
tree 2a1ecfdfcf236104e23b95b91579896e9bd8e379
parent ae7bc6529a40cdc25c65c28b76266e0c873861c4

Add a new permission for user space VPN applications.

Change-Id: I2b87ef34db01209dac45fbceccafd865840830d5

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 2d85ccc..419578c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -358,6 +358,14 @@
         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"