summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-09-02 16:13:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-02 16:13:13 -0700
commitd91493249d3cbf795b3dd4813966624f08bd6e2e (patch)
tree873897f817fb549cecff0b3345de8d23da186ae2 /src/com
parent4f79a14a8aa067463dad15a018370012ed593608 (diff)
parent276b1353fdc33cc91cfcd5c79f77b6857543859d (diff)
downloadpackages_apps_Browser-d91493249d3cbf795b3dd4813966624f08bd6e2e.zip
packages_apps_Browser-d91493249d3cbf795b3dd4813966624f08bd6e2e.tar.gz
packages_apps_Browser-d91493249d3cbf795b3dd4813966624f08bd6e2e.tar.bz2
Merge "Small startup perf improvement"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/BrowserSettings.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 09c7200..11316ff 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -128,7 +128,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
mAutofillHandler = new AutofillHandler(mContext);
mManagedSettings = new LinkedList<WeakReference<WebSettings>>();
mCustomUserAgents = new WeakHashMap<WebSettings, String>();
- mPrefs.registerOnSharedPreferenceChangeListener(this);
mAutofillHandler.asyncLoadFromDb();
BackgroundHandler.execute(mSetup);
}
@@ -168,6 +167,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
mWebStorageSizeManager = new WebStorageSizeManager(mContext,
new WebStorageSizeManager.StatFsDiskInfo(getAppCachePath()),
new WebStorageSizeManager.WebKitAppCacheInfo(getAppCachePath()));
+ // Workaround b/5253777
+ CookieManager.getInstance().acceptCookie();
+ // Workaround b/5254577
+ mPrefs.registerOnSharedPreferenceChangeListener(BrowserSettings.this);
if (Build.VERSION.CODENAME.equals("REL")) {
// This is a release build, always startup with debug disabled
setDebugEnabled(false);