X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fandroid%2Fbrowser%2FCombinedBookmarkHistoryActivity.java;h=a079cceafece33716829385021004f0c4010113a;hb=83fe6d688ef4a9eb581455152b398d577ea6514c;hp=dd29121bef9d9657dbff41fc3fd299533112a3f2;hpb=cc9491236354dd59bffc976f6b55b86e558dc628;p=android-x86%2Fpackages-apps-Browser.git

diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
index dd29121..a079cce 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
@@ -125,6 +125,9 @@ public class CombinedBookmarkHistoryActivity extends TabActivity
             getTabHost().setCurrentTab(2);
         }
 
+        // XXX: Must do this before launching the AsyncTask to avoid a
+        // potential crash if the icon database has not been created.
+        WebIconDatabase.getInstance();
         // Do this every time we launch the activity in case a new favicon was
         // added to the webkit db.
         (new AsyncTask<Void, Void, Void>() {