diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-08-08 11:33:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-08 11:33:57 -0700 |
| commit | 880f64ac1080ccec111de91a4af026cca3d1bb25 (patch) | |
| tree | e4050b3689f30ebe6d015f106c0b11c276b6104f /core/res/AndroidManifest.xml | |
| parent | 930740d1efe00fabc9ff4354cb0379cbbf0765af (diff) | |
| parent | 199ed6ef89bd356895534ba09ac43ed340cd9a1a (diff) | |
| download | frameworks_base-880f64ac1080ccec111de91a4af026cca3d1bb25.zip frameworks_base-880f64ac1080ccec111de91a4af026cca3d1bb25.tar.gz frameworks_base-880f64ac1080ccec111de91a4af026cca3d1bb25.tar.bz2 | |
Merge "VPN: introduce VpnService as the base class for user space VPN."
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 57b686a..d54f852 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1118,6 +1118,14 @@ android:description="@string/permdesc_bindTextService" android:protectionLevel="signature" /> + <!-- Must be required by an {@link android.net.VpnService}, + to ensure that only the system can bind to it. + @hide --> + <permission android:name="android.permission.BIND_VPN_SERVICE" + android:label="@string/permlab_bindVpnService" + android:description="@string/permdesc_bindVpnService" + android:protectionLevel="signature" /> + <!-- Must be required by a {@link android.service.wallpaper.WallpaperService}, to ensure that only the system can bind to it. --> <permission android:name="android.permission.BIND_WALLPAPER" |