diff options
| author | Wink Saville <wink@google.com> | 2011-05-03 16:33:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-03 16:33:08 -0700 |
| commit | ee081bf5ee936396a89d5bd2b29487047b260f49 (patch) | |
| tree | 8bd4e6ed2c0ff775dfaff730f40189ee714f5999 /data/etc | |
| parent | 2d40bf91e6ad71505ec84743c5ad0b854ecf5928 (diff) | |
| parent | 3ed0a1ec7aa6364c236721a1bd29fd196f259cba (diff) | |
| download | frameworks_base-ee081bf5ee936396a89d5bd2b29487047b260f49.zip frameworks_base-ee081bf5ee936396a89d5bd2b29487047b260f49.tar.gz frameworks_base-ee081bf5ee936396a89d5bd2b29487047b260f49.tar.bz2 | |
am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
IMS: Provide net_admin permission so that IPSec could be configured/used.
Diffstat (limited to 'data/etc')
| -rw-r--r-- | data/etc/platform.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index df80546..692ea9d 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -62,6 +62,10 @@ <group gid="mtp" /> </permission> + <permission name="android.permission.NET_ADMIN" > + <group gid="net_admin" /> + </permission> + <!-- The group that /cache belongs to, linked to the permission set on the applications that can access /cache --> <permission name="android.permission.ACCESS_CACHE_FILESYSTEM" > |