Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 001c7d12: Merge "Set capabilities sooner." into gingerbread

Browse Source
This commit is contained in:
Andy McFadden
2010-10-27 13:25:29 -07:00
committed by Android Git Automerger
parent 57f7ccc422 001c7d1281
commit e3e8642ce4
2 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/os/ZygoteConnection.java
View File

@@ -680,19 +680,6 @@ class ZygoteConnection {
FileDescriptor[] descriptors, PrintStream newStderr)
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.

16
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -491,18 +491,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();
@@ -548,7 +536,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);
}