commit 275a7101ee18b60231621f121d82b100fbdf26d9
author Grace Kloba <klobag@google.com> Thu Mar 18 08:42:40 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 18 08:42:40 2010 -0700
tree 6bf77d13a2218fe650fdf539cada46d95ed8dd8d
parent 83fe6d688ef4a9eb581455152b398d577ea6514c
parent 1542f74d866056aac0cc5ffc328940a4b8ba626c

Merge "Do not call invalidate() in draw(). This improved  Browser loading performance by 10%. Loading nytimes.com on Sholes with plugin dropped from 30s to 26s."

src/com/android/browser/CombinedBookmarkHistoryActivity.java

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 @@
             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>() {