diff options
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 13 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 16 |
2 files changed, 3 insertions, 26 deletions
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index da0c5a2..c473fd2 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -681,19 +681,6 @@ class ZygoteConnection { throws ZygoteInit.MethodAndArgsCaller { /* - * First, set the capabilities if necessary - */ - - if (parsedArgs.uid != 0) { - try { - ZygoteInit.setCapabilities(parsedArgs.permittedCapabilities, - parsedArgs.effectiveCapabilities); - } catch (IOException ex) { - Log.e(TAG, "Error setting capabilities", ex); - } - } - - /* * Close the socket, unless we're in "peer wait" mode, in which * case it's used to track the liveness of this process. */ diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 1d54c61..848bf9e 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -492,18 +492,6 @@ public class ZygoteInit { private static void handleSystemServerProcess( ZygoteConnection.Arguments parsedArgs) throws ZygoteInit.MethodAndArgsCaller { - /* - * First, set the capabilities if necessary - */ - - if (parsedArgs.uid != 0) { - try { - setCapabilities(parsedArgs.permittedCapabilities, - parsedArgs.effectiveCapabilities); - } catch (IOException ex) { - Log.e(TAG, "Error setting capabilities", ex); - } - } closeServerSocket(); @@ -552,7 +540,9 @@ public class ZygoteInit { /* Request to fork the system server process */ pid = Zygote.forkSystemServer( parsedArgs.uid, parsedArgs.gid, - parsedArgs.gids, debugFlags, null); + parsedArgs.gids, debugFlags, null, + parsedArgs.permittedCapabilities, + parsedArgs.effectiveCapabilities); } catch (IllegalArgumentException ex) { throw new RuntimeException(ex); } |