Not using a async task for removing session cookies
The cookie manager method are now taking care of making
this async and blocking on the webcore thread
Change-Id: I52d69b4e277aef84a59ff777302c7b223831b724
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index e433e29..4dc4c4b 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -265,13 +265,8 @@
mUi.needsRestoreAllTabs())) {
// there is no quit on Android. But if we can't restore the state,
// we can treat it as a new Browser, remove the old session cookies.
- AsyncTask cookieCleaningTask = new AsyncTask<Object, Void, Void>() {
- protected Void doInBackground(Object... none) {
- CookieManager.getInstance().removeSessionCookie();
- return null;
- }
- };
- cookieCleaningTask.execute();
+ // This is done async in the CookieManager.
+ CookieManager.getInstance().removeSessionCookie();
// remove any incognito files
WebView.cleanupPrivateBrowsingFiles();
@@ -300,11 +295,6 @@
}
}
- // Wait for sessions cookies to be cleared before loading urls
- try {
- cookieCleaningTask.get();
- } catch(InterruptedException e) {
- } catch(java.util.concurrent.ExecutionException e) {}
if (urlData.isEmpty()) {
loadUrl(webView, mSettings.getHomePage());
} else {