commit cc14c8c4da26ff93a96078c7c9108682c23bd1af
author Leon Scroggins III <scroggo@google.com> Mon Sep 27 12:45:34 2010 -0400
committer Leon Scroggins III <scroggo@google.com> Mon Sep 27 12:58:47 2010 -0400
tree 72dce84bbb69326da60a51047e1b270e93812da4
parent 3c54806d6d99d53b3f8c737dc134806306c1b6c7

Prevent a null pointer exception.

Bug: 3035805
Change-Id: Id6c7d2105087e3ad4b250da6d4944409d01e55a9

src/com/android/browser/BrowserActivity.java

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 @@
 
         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 @@
         // 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);