diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-09-13 11:08:36 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-09-13 11:08:36 +0100 |
| commit | 8dbb5e51c8419eeec8b6fcddb101fcdf40ca9f03 (patch) | |
| tree | 5ab0e66df9c127ed20056cc73764928495b0948b /core/java/android/os/Process.java | |
| parent | 2a4b62dd12240e7b21bec23615f59a3da41a3422 (diff) | |
| parent | e017dae5873cecf2a42f4e2709680c44fc287c88 (diff) | |
resolve merge conflicts of e017dae5873c to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50
Diffstat (limited to 'core/java/android/os/Process.java')
| -rw-r--r-- | core/java/android/os/Process.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 93516619aab6..b5d62e555edc 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -19,8 +19,8 @@ package android.os; import android.annotation.TestApi; import android.system.Os; import android.system.OsConstants; -import android.util.Log; import android.webkit.WebViewZygote; + import dalvik.system.VMRuntime; /** @@ -423,7 +423,7 @@ public class Process { * * When invokeWith is not null, the process will be started as a fresh app * and not a zygote fork. Note that this is only allowed for uid 0 or when - * debugFlags contains DEBUG_ENABLE_DEBUGGER. + * runtimeFlags contains DEBUG_ENABLE_DEBUGGER. * * @param processClass The class to use as the process's main entry * point. @@ -431,7 +431,7 @@ public class Process { * @param uid The user-id under which the process will run. * @param gid The group-id under which the process will run. * @param gids Additional group-ids associated with the process. - * @param debugFlags Additional flags. + * @param runtimeFlags Additional flags for the runtime. * @param targetSdkVersion The target SDK version for the app. * @param seInfo null-ok SELinux information for the new process. * @param abi non-null the ABI this app should be started with. @@ -448,7 +448,7 @@ public class Process { public static final ProcessStartResult start(final String processClass, final String niceName, int uid, int gid, int[] gids, - int debugFlags, int mountExternal, + int runtimeFlags, int mountExternal, int targetSdkVersion, String seInfo, String abi, @@ -457,7 +457,7 @@ public class Process { String invokeWith, String[] zygoteArgs) { return zygoteProcess.start(processClass, niceName, uid, gid, gids, - debugFlags, mountExternal, targetSdkVersion, seInfo, + runtimeFlags, mountExternal, targetSdkVersion, seInfo, abi, instructionSet, appDataDir, invokeWith, zygoteArgs); } @@ -465,7 +465,7 @@ public class Process { public static final ProcessStartResult startWebView(final String processClass, final String niceName, int uid, int gid, int[] gids, - int debugFlags, int mountExternal, + int runtimeFlags, int mountExternal, int targetSdkVersion, String seInfo, String abi, @@ -474,7 +474,7 @@ public class Process { String invokeWith, String[] zygoteArgs) { return WebViewZygote.getProcess().start(processClass, niceName, uid, gid, gids, - debugFlags, mountExternal, targetSdkVersion, seInfo, + runtimeFlags, mountExternal, targetSdkVersion, seInfo, abi, instructionSet, appDataDir, invokeWith, zygoteArgs); } |