Ensure engine is initialized for all activity's

Ensure engine is initialized for all activity's in the browser. Monkey test
seems to launch individual activity and causes crash if engine is not
initialized.

Change-Id: I13706499262d9f7aeb2eb4c49be79cc26f1234a8
CR-Fixed:: SWE-6572

9 files changed, 59 insertions, 1 deletions

diff --git a/src/com/android/browser/AddBookmarkFolder.java b/src/com/android/browser/AddBookmarkFolder.java
index 521508ed..3ed55fc5 100644
--- a/src/com/android/browser/AddBookmarkFolder.java
+++ b/src/com/android/browser/AddBookmarkFolder.java
@@ -31,6 +31,7 @@ import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -73,6 +74,8 @@ public class AddBookmarkFolder extends Activity implements View.OnClickListener,
 
     /* package */static final String EXTRA_IS_FOLDER = "is_folder";
 
+    private final static String LOGTAG = "AddBookmarkFolder";
+
     private static final int MAX_CRUMBS_SHOWN = 1;
 
     private long mOriginalFolder = -1;
@@ -586,6 +589,11 @@ public class AddBookmarkFolder extends Activity implements View.OnClickListener,
 
     @Override
     protected void onCreate(Bundle icicle) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
+
         super.onCreate(icicle);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
 
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 25cde080..2c99b6e1 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -58,6 +58,7 @@ import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.util.Log;
 
 import com.android.browser.BrowserUtils;
 import com.android.browser.R;
@@ -645,6 +646,10 @@ public class AddBookmarkPage extends Activity
 
     @Override
     protected void onCreate(Bundle icicle) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(icicle);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
 
diff --git a/src/com/android/browser/BookmarkSearch.java b/src/com/android/browser/BookmarkSearch.java
index 4d3ca0f3..63130159 100644
--- a/src/com/android/browser/BookmarkSearch.java
+++ b/src/com/android/browser/BookmarkSearch.java
@@ -17,18 +17,24 @@
 package com.android.browser;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
+import android.util.Log;
 /**
  * This activity is never started from the browser. Its purpose is to provide bookmark suggestions
  * to global search (through its searchable meta-data), and to handle the intents produced
  * by clicking such suggestions.
  */
 public class BookmarkSearch extends Activity {
+    private final String LOGTAG = "BookmarkSearch";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         Intent intent = getIntent();
         if (intent != null) {
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 47314519..5c6df08d 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -17,17 +17,20 @@ package com.android.browser;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.util.Log;
 
 import com.android.browser.UI.ComboViews;
 
 public class ComboViewActivity extends Activity implements CombinedBookmarksCallbacks {
 
+    private static final String LOGTAG = "ComboViewActivity";
     private static final String STATE_SELECTED_TAB = "tab";
     public static final String EXTRA_COMBO_ARGS = "combo_args";
     public static final String EXTRA_INITIAL_VIEW = "initial_view";
@@ -40,6 +43,10 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         setResult(RESULT_CANCELED);
         Bundle extras = getIntent().getExtras();
diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index 05e7fe62..aa528d22 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -54,6 +54,7 @@ import android.webkit.MimeTypeMap;
 import android.text.TextUtils;
 import android.content.pm.PackageManager;
 import android.Manifest.permission;
+import android.content.Context;
 
 import com.android.browser.reflect.ReflectHelper;
 
@@ -91,6 +92,10 @@ public class DownloadSettings extends Activity {
     private int nextRequestCode = 2000;
 
     protected void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         // initial the DownloadSettings view
         requestWindowFeature(Window.FEATURE_NO_TITLE);
diff --git a/src/com/android/browser/ShortcutActivity.java b/src/com/android/browser/ShortcutActivity.java
index dcc176f0..f947fe9c 100644
--- a/src/com/android/browser/ShortcutActivity.java
+++ b/src/com/android/browser/ShortcutActivity.java
@@ -24,14 +24,21 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.util.Log;
+import android.content.Context;
 
 public class ShortcutActivity extends Activity
     implements BookmarksPageCallbacks, OnClickListener {
 
+    private static final String LOGTAG = "ShortcutActivity";
     private BrowserBookmarksPage mBookmarks;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         setTitle(R.string.shortcut_bookmark_title);
         setContentView(R.layout.pick_bookmark);
diff --git a/src/com/android/browser/mynavigation/AddMyNavigationPage.java b/src/com/android/browser/mynavigation/AddMyNavigationPage.java
index cc42d96a..430b5ddc 100755
--- a/src/com/android/browser/mynavigation/AddMyNavigationPage.java
+++ b/src/com/android/browser/mynavigation/AddMyNavigationPage.java
@@ -55,6 +55,7 @@ import com.android.browser.BrowserUtils;
 import com.android.browser.R;
 import com.android.browser.UrlUtils;
 import com.android.browser.platformsupport.WebAddress;
+import com.android.browser.EngineInitializer;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URI;
@@ -88,6 +89,10 @@ public class AddMyNavigationPage extends Activity {
     };
 
     protected void onCreate(Bundle icicle) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(icicle);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.my_navigation_add_page);
diff --git a/src/com/android/browser/preferences/LegalPreviewActivity.java b/src/com/android/browser/preferences/LegalPreviewActivity.java
index 4ca9d638..94ffea4d 100644
--- a/src/com/android/browser/preferences/LegalPreviewActivity.java
+++ b/src/com/android/browser/preferences/LegalPreviewActivity.java
@@ -37,15 +37,23 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.view.KeyEvent;
 import android.view.MenuItem;
+import android.util.Log;
+import android.content.Context;
+import com.android.browser.EngineInitializer;
 
 import com.android.browser.R;
 
 public class LegalPreviewActivity extends FragmentActivity {
     LegalPreviewFragment mLegalPreviewFragment;
     protected static final String URL_INTENT_EXTRA = "url";
+    private final static String LOGTAG = "LegalPreviewActivity";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.credits_tab);
         ActionBar bar = getActionBar();
diff --git a/src/com/android/browser/widget/BookmarkWidgetConfigure.java b/src/com/android/browser/widget/BookmarkWidgetConfigure.java
index 2dee9894..f0309aa7 100644
--- a/src/com/android/browser/widget/BookmarkWidgetConfigure.java
+++ b/src/com/android/browser/widget/BookmarkWidgetConfigure.java
@@ -29,22 +29,29 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.util.Log;
 
 import com.android.browser.R;
 import com.android.browser.AddBookmarkPage.BookmarkAccount;
 import com.android.browser.platformsupport.BrowserContract.Accounts;
 import com.android.browser.provider.BrowserProvider2;
+import com.android.browser.EngineInitializer;
 
 public class BookmarkWidgetConfigure extends ListActivity
         implements OnClickListener, LoaderCallbacks<Cursor> {
 
     static final int LOADER_ACCOUNTS = 1;
+    private static final String LOGTAG = "BookmarkWidgetConfigure";
 
     private ArrayAdapter<BookmarkAccount> mAccountAdapter;
     private int mAppWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (!EngineInitializer.isInitialized()) {
+            Log.e(LOGTAG, "Engine not Initialized");
+            EngineInitializer.initializeSync((Context) getApplicationContext());
+        }
         super.onCreate(savedInstanceState);
         setResult(RESULT_CANCELED);
         setVisible(false);