Merge "Set capabilities sooner." into gingerbread (001c7d12) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/ZygoteConnection.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -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.

+3 −13

Original line number	Diff line number	Diff line
		@@ -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);
		}