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

Commit ec9b5d17 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that... 

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

* commit 'ee081bf5':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
parents 50a2f8f6 ee081bf5

core/res/AndroidManifest.xml

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

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

data/etc/platform.xml

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