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

Commit 1df62d27 authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

Merge "Permissions to protect socket marking settings"

parents aec59fa0 f11e5d34
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -2259,6 +2259,16 @@
        android:description="@string/permdesc_modifyNetworkAccounting"
        android:protectionLevel="signature|system" />

    <!-- Allows an application to mark traffic as from another user for per user routing.
         Used by system wide services like media server that execute delegated network connections
         for users.
         @hide
    -->
    <permission android:name="android.permission.MARK_NETWORK_SOCKET"
        android:label="@string/permlab_markNetworkSocket"
        android:description="@string/permdesc_markNetworkSocket"
        android:protectionLevel="signature|system" />

    <!-- C2DM permission.
         @hide Used internally.
     -->
+5 −0
Original line number Diff line number Diff line
@@ -1852,6 +1852,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_modifyNetworkAccounting">Allows the app to modify how network usage is accounted against apps. Not for use by normal apps.</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_markNetworkSocket">modify socket marks</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_markNetworkSocket">Allows the app to modify socket marks for routing</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_accessNotifications">access notifications</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->