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
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 4731451..5c6df08 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -17,17 +17,20 @@
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 @@
@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();