From 161974f7f198e1e821297ab1aa46f9f124a972ed Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Tue, 9 Mar 2010 14:30:07 -0800
Subject: Avoid potential NPE if storage manager is not properly initialized.

Bug: 2498939
Change-Id: I92a14fdcb949d748bebec0a357d8baad37aeb46e
---
 src/com/android/browser/Browser.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/com/android/browser/Browser.java')

diff --git a/src/com/android/browser/Browser.java b/src/com/android/browser/Browser.java
index 524f78962..7822ec88f 100644
--- a/src/com/android/browser/Browser.java
+++ b/src/com/android/browser/Browser.java
@@ -57,6 +57,7 @@ public class Browser extends Application {
         CookieSyncManager.createInstance(this);
         // remove all expired cookies
         CookieManager.getInstance().removeExpiredCookie();
+        BrowserSettings.getInstance().loadFromDb(this);
     }
 
     static Intent createBrowserViewIntent() {
-- 
cgit v1.2.3