Remove pre-login on every tab.
Only attempt pre-login once unless the Browser's data is cleared. Remove
preferences for pre-login and code to detect cookies.
Bug: 3367381
Change-Id: I321a7c09be27ff6f3f570d0b9963ee2984b01c4a
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index b04c956..82aea47 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -279,7 +279,7 @@
CookieManager.getInstance().removeSessionCookie();
}
- GoogleAccountLogin.startLoginIfNeeded(mActivity, mSettings,
+ GoogleAccountLogin.startLoginIfNeeded(mActivity,
new Runnable() {
@Override public void run() {
start(icicle, intent, currentTab, restoreIncognitoTabs);
@@ -2229,17 +2229,9 @@
// animation behavior.
addTab(tab);
setActiveTab(tab);
-
- // Callback to load the url data.
- final Runnable load = new Runnable() {
- @Override public void run() {
- if (!urlData.isEmpty()) {
- loadUrlDataIn(tab, urlData);
- }
- }
- };
-
- GoogleAccountLogin.startLoginIfNeeded(mActivity, mSettings, load);
+ if (!urlData.isEmpty()) {
+ loadUrlDataIn(tab, urlData);
+ }
return tab;
} else {
// Get rid of the subwindow if it exists