diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index df2aea85fb99..59f890520bca 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2235,6 +2235,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. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3e2d8d377fe6..c56088a1ff7e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1832,6 +1832,11 @@ <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. --> <string name="permdesc_accessNotifications">Allows the app to retrieve, examine, and clear notifications, including those posted by other apps.</string> |