diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-27 10:39:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 10:39:16 -0700 |
| commit | da9f155662e8ea94bdda16e33b660769669148a7 (patch) | |
| tree | c649c4e0fffd15082fb8ec8da7842a47a33185fb /src | |
| parent | f4ccbc5d46f43dc18e3b87cb3348a634e003630f (diff) | |
| parent | cc14c8c4da26ff93a96078c7c9108682c23bd1af (diff) | |
| download | packages_apps_Browser-da9f155662e8ea94bdda16e33b660769669148a7.zip packages_apps_Browser-da9f155662e8ea94bdda16e33b660769669148a7.tar.gz packages_apps_Browser-da9f155662e8ea94bdda16e33b660769669148a7.tar.bz2 | |
am cc14c8c4: Prevent a null pointer exception.
Merge commit 'cc14c8c4da26ff93a96078c7c9108682c23bd1af' into gingerbread-plus-aosp
* commit 'cc14c8c4da26ff93a96078c7c9108682c23bd1af':
Prevent a null pointer exception.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 5 |
1 files 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); |