diff options
| author | Wink Saville <wink@google.com> | 2011-05-03 16:36:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-03 16:36:36 -0700 |
| commit | ec9b5d17af1199e418b7352313575f0f7288b550 (patch) | |
| tree | 1b8f7ca979feb31835b2332df0cc9c66a836ae0b | |
| parent | 50a2f8f66173ebafdfe961c73aad4fd22e164b52 (diff) | |
| parent | ee081bf5ee936396a89d5bd2b29487047b260f49 (diff) | |
| download | frameworks_base-ec9b5d17af1199e418b7352313575f0f7288b550.zip frameworks_base-ec9b5d17af1199e418b7352313575f0f7288b550.tar.gz frameworks_base-ec9b5d17af1199e418b7352313575f0f7288b550.tar.bz2 | |
am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit 'ee081bf5ee936396a89d5bd2b29487047b260f49':
IMS: Provide net_admin permission so that IPSec could be configured/used.
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | data/etc/platform.xml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 2ed39e4..1c4bffd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -496,6 +496,12 @@ android:label="@string/permlab_hardware_test" android:description="@string/permdesc_hardware_test" /> + <!-- Allows access to configure network interfaces, configure/use IPSec, etc. + @hide --> + <permission android:name="android.permission.NET_ADMIN" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="signature" /> + <!-- =========================================== --> <!-- Permissions associated with telephony state --> <!-- =========================================== --> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 1870a4a..5ed7966 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -66,6 +66,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" > |