diff options
| author | Kevin Hart <khart@codeaurora.org> | 2015-04-28 11:35:30 -0700 |
|---|---|---|
| committer | WebTech Code Review <code-review@localhost> | 2015-05-27 12:08:14 -0700 |
| commit | a3d001de1261fde39df73a9ff41d62b78605d57d (patch) | |
| tree | 6fd723a2ddf461241199fcae0a41aa23306e4eff /src | |
| parent | 89cf4d8d663fd388c93e92dede6ca0ad387edccc (diff) | |
| download | android_packages_apps_Gello-a3d001de1261fde39df73a9ff41d62b78605d57d.tar.gz android_packages_apps_Gello-a3d001de1261fde39df73a9ff41d62b78605d57d.tar.bz2 android_packages_apps_Gello-a3d001de1261fde39df73a9ff41d62b78605d57d.zip | |
Don't warm up child process in single-process mode
Change-Id: Ibae7305adb206c9bdc2a4b124ef15146320fd76e
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/EngineInitializer.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/browser/EngineInitializer.java b/src/com/android/browser/EngineInitializer.java index 7a0c2364..27ffbe0d 100644 --- a/src/com/android/browser/EngineInitializer.java +++ b/src/com/android/browser/EngineInitializer.java @@ -56,6 +56,10 @@ public class EngineInitializer { //Command line flag for strict mode private final static String STRICT_MODE = "enable-strict-mode"; + // Command line flag for single-process mode. + // Must match the value of kSingleProcess in content_switches.cc + private static final String SINGLE_PROCESS = "single-process"; + private static boolean mInitializationStarted = false; private static boolean mSynchronousInitialization = false; private static boolean mInitializationCompleted = false; @@ -277,9 +281,9 @@ public class EngineInitializer { } Engine.loadNativeLibraries(mApplicationContext); - - Engine.warmUpChildProcess(mApplicationContext); - + if (!BrowserCommandLine.hasSwitch(SINGLE_PROCESS)) { + Engine.warmUpChildProcess(mApplicationContext); + } return true; } catch (Exception e) |