drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-05-03 16:19:58 -07:00
committed by Android (Google) Code Review
parent 75c664582c 0e7b5a0287
commit 3ed0a1ec7a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/AndroidManifest.xml
View File

@ -495,6 +495,12 @@
android:label="@string/permlab_hardware_test" android:label="@string/permlab_hardware_test"
android:description="@string/permdesc_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 --> <!-- Permissions associated with telephony state -->
<!-- =========================================== --> <!-- =========================================== -->

4
data/etc/platform.xml
View File

@ -62,6 +62,10 @@
<group gid="mtp" /> <group gid="mtp" />
</permission> </permission>
<permission name="android.permission.NET_ADMIN" >
<group gid="net_admin" />
</permission>
<!-- The group that /cache belongs to, linked to the permission <!-- The group that /cache belongs to, linked to the permission
set on the applications that can access /cache --> set on the applications that can access /cache -->
<permission name="android.permission.ACCESS_CACHE_FILESYSTEM" > <permission name="android.permission.ACCESS_CACHE_FILESYSTEM" >