From cc14c8c4da26ff93a96078c7c9108682c23bd1af Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 27 Sep 2010 12:45:34 -0400 Subject: [PATCH] Prevent a null pointer exception. Bug: 3035805 Change-Id: Id6c7d2105087e3ad4b250da6d4944409d01e55a9 --- src/com/android/browser/BrowserActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 098e3b2..72ed2ec 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -191,6 +191,9 @@ public class BrowserActivity extends Activity mResolver = getContentResolver(); + // Keep a settings instance handy. + mSettings = BrowserSettings.getInstance(); + // If this was a web search request, pass it on to the default web // search provider and finish this activity. if (handleWebSearchIntent(getIntent())) { @@ -225,8 +228,6 @@ public class BrowserActivity extends Activity // Open the icon database and retain all the bookmark urls for favicons retainIconsOnStartup(); - // Keep a settings instance handy. - mSettings = BrowserSettings.getInstance(); mSettings.setTabControl(mTabControl); PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); -- 2.11.0