Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed0a1ec authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "IMS: Provide net_admin permission so that IPSec could be... 

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

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -495,6 +495,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 -->

    <!-- =========================================== -->

data/etc/platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -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" >