diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-07-27 18:35:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 18:35:51 -0700 |
| commit | fcbb4924864976339d5ad8b7adb925d7a050df6a (patch) | |
| tree | 3d347bb1cbcb7776f59c6e8712f709c5c5bea76b /core | |
| parent | 00fd1fc9b38a2e59b5ab5ad3f19a6e581dc5f428 (diff) | |
| parent | 3c2529c717cda3df321c1d0d6abe23ac1f298ac9 (diff) | |
| download | frameworks_base-fcbb4924864976339d5ad8b7adb925d7a050df6a.zip frameworks_base-fcbb4924864976339d5ad8b7adb925d7a050df6a.tar.gz frameworks_base-fcbb4924864976339d5ad8b7adb925d7a050df6a.tar.bz2 | |
Merge "Unhide APIs for user space VPN."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/VpnBuilder.java | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/net/VpnBuilder.java b/core/java/android/net/VpnBuilder.java index 4582523..25cedb6 100644 --- a/core/java/android/net/VpnBuilder.java +++ b/core/java/android/net/VpnBuilder.java @@ -91,7 +91,6 @@ import java.util.ArrayList; * * <p class="note">Using this class requires * {@link android.Manifest.permission#VPN} permission. - * @hide */ public class VpnBuilder { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 91003d1..92ba1d0 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -393,8 +393,7 @@ android:description="@string/permdesc_nfc" android:label="@string/permlab_nfc" /> - <!-- Allows applications to provide VPN functionality. - @hide Pending API council approval --> + <!-- Allows applications to provide VPN functionality --> <permission android:name="android.permission.VPN" android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="dangerous" |