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

Commit 845678fc authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Permissions to protect bandwidth statistics."

parents b3f19ca3 9e18fd1a
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1393,6 +1393,14 @@
        android:description="@string/permdesc_manageNetworkPolicy"
        android:protectionLevel="signature" />

    <!-- Allows an application to account its network traffic against other UIDs. Used
         by system services like download manager and media server. Not for use by
         third party apps. @hide -->
    <permission android:name="android.permission.MODIFY_NETWORK_ACCOUNTING"
        android:label="@string/permlab_modifyNetworkAccounting"
        android:description="@string/permdesc_modifyNetworkAccounting"
        android:protectionLevel="signatureOrSystem" />

    <!-- C2DM permission. 
         @hide Used internally.
     -->
+5 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,11 @@
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_manageNetworkPolicy">Allows an application to manage network policies and define application-specific rules.</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permlab_modifyNetworkAccounting">modify network usage accounting</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_modifyNetworkAccounting">Allows modification of how network usage is accounted against applications. Not for use by normal applications.</string>

    <!-- Policy administration -->

    <!-- Title of policy access to limiting the user's password choices -->
+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,16 @@
        <group gid="diag" />
    </permission>

    <!-- Group that can read detailed network usage statistics -->
    <permission name="android.permission.READ_NETWORK_USAGE_HISTORY">
        <group gid="net_bw_stats" />
    </permission>

    <!-- Group that can modify how network statistics are accounted -->
    <permission name="android.permission.MODIFY_NETWORK_ACCOUNTING">
        <group gid="net_bw_acct" />
    </permission>

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