summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/EngineInitializer.java
diff options
context:
space:
mode:
authorVivek Sekhar <vsekhar@codeaurora.org>2015-08-11 14:12:52 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-08-28 13:15:48 +0200
commitf7ce2fba35fe65e8d76b29b96b03aedc6093bc51 (patch)
tree9d498764454ea2c6efecfe873637c8e1395be506 /src/com/android/browser/EngineInitializer.java
parent370056110df018780d0ef2bd4b284ae5f93bc16a (diff)
downloadandroid_packages_apps_Gello-f7ce2fba35fe65e8d76b29b96b03aedc6093bc51.tar.gz
android_packages_apps_Gello-f7ce2fba35fe65e8d76b29b96b03aedc6093bc51.tar.bz2
android_packages_apps_Gello-f7ce2fba35fe65e8d76b29b96b03aedc6093bc51.zip
Move command line resources to browser
- Added dummy raw files for overlay - Modified how command line switches are initialized Change-Id: I3954624f416484f321bf50b0faf2692059a2d84d
Diffstat (limited to 'src/com/android/browser/EngineInitializer.java')
-rw-r--r--src/com/android/browser/EngineInitializer.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/browser/EngineInitializer.java b/src/com/android/browser/EngineInitializer.java
index b64f493e..1a1b0707 100644
--- a/src/com/android/browser/EngineInitializer.java
+++ b/src/com/android/browser/EngineInitializer.java
@@ -320,7 +320,7 @@ public class EngineInitializer {
if (!mInitializationStarted) {
mInitializationStarted = true;
mUiThreadHandler = new Handler(Looper.getMainLooper());
- Engine.initializeCommandLine(ctx);
+ Engine.initializeCommandLine(ctx, CommandLineManager.getCommandLineSwitches(ctx));
mInitializeTask = new InitializeTask(ctx);
mInitializeTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
mActivitySchedulerMap = new HashMap<BrowserActivity, ActivityScheduler>();
@@ -356,8 +356,9 @@ public class EngineInitializer {
assert runningOnUiThread() : "Tried to initialize the engine on the wrong thread.";
if (!mInitializationCompleted) {
+
// TODO: Evaluate the benefit of async Engine.initialize()
- Engine.initialize(ctx);
+ Engine.initialize(ctx, CommandLineManager.getCommandLineSwitches(ctx));
// Add the browser commandline options
BrowserConfig.getInstance(ctx).initCommandLineSwitches();