mtpd: Use capabilities instead of GIDs.

The 'net_admin'/'net_raw' GIDs are an Android addition that does not
exist upstream. Replace them with capabilities which are an upstream
feature. This will allow us to drop those kernel patches.

Bug: 33938230
Test: 'start mtpd', 'cat /proc/`pgrep mtpd`/status | grep Cap'.
Test: "Cap" lines show correct mask: 0000000000003000
Test: Add a VPN, enable it, mtpd starts correctly.

Change-Id: I734ed1ae38e6d7d6a8ba393395a5cdb7c98dfe9e

1 files changed, 2 insertions, 1 deletions

diff --git a/mtpd.rc b/mtpd.rc
index ff2d311..af701d5 100644
--- a/mtpd.rc
+++ b/mtpd.rc
@@ -2,6 +2,7 @@ service mtpd /system/bin/mtpd
     class main
     socket mtpd stream 600 system system
     user vpn
-    group vpn net_admin inet net_raw
+    group vpn inet
+    capabilities NET_ADMIN NET_RAW
     disabled
     oneshot