From efce929711536274fddc0642df162df1dddc7752 Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Fri, 11 Jan 2019 13:19:20 -0800 Subject: Code cleanup to conform to style guide / linter. This commit made the following changes to make the code conform to the Frameworks style guide: * Re-named variables * Re-flowed code * Organized includes Topic: zygote-prefork Test: make & flash & launch apps Bug: 68253328 Change-Id: I9274b32f1f606f29f6eb3a1e5068ca18f607afe7 --- core/java/android/os/Process.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'core/java/android/os/Process.java') diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index f2a9adb6feea..07c4933e2e3f 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -31,16 +31,6 @@ import dalvik.system.VMRuntime; public class Process { private static final String LOG_TAG = "Process"; - /** - * @hide for internal use only. - */ - public static final String ZYGOTE_SOCKET = "zygote"; - - /** - * @hide for internal use only. - */ - public static final String SECONDARY_ZYGOTE_SOCKET = "zygote_secondary"; - /** * An invalid UID value. */ @@ -479,8 +469,7 @@ public class Process { * State associated with the zygote process. * @hide */ - public static final ZygoteProcess zygoteProcess = - new ZygoteProcess(ZYGOTE_SOCKET, SECONDARY_ZYGOTE_SOCKET); + public static final ZygoteProcess ZYGOTE_PROCESS = new ZygoteProcess(); /** * Start a new process. @@ -538,7 +527,7 @@ public class Process { @Nullable String[] packagesForUid, @Nullable String[] visibleVols, @Nullable String[] zygoteArgs) { - return zygoteProcess.start(processClass, niceName, uid, gid, gids, + return ZYGOTE_PROCESS.start(processClass, niceName, uid, gid, gids, runtimeFlags, mountExternal, targetSdkVersion, seInfo, abi, instructionSet, appDataDir, invokeWith, packageName, packagesForUid, visibleVols, zygoteArgs); -- cgit v1.2.3