summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserActivity.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-02-04 09:27:26 -0500
committerPatrick Scott <phanna@android.com>2011-02-04 13:22:01 -0500
commit7d50a9364107c21e3358e1dbc51a06359a5287fb (patch)
tree77912ffefe7bfd6fbcccf956adfba8e39fe592ff /src/com/android/browser/BrowserActivity.java
parent18793490c4a4fe1a9979218c7b3f2c88bc04e128 (diff)
downloadpackages_apps_browser-7d50a9364107c21e3358e1dbc51a06359a5287fb.zip
packages_apps_browser-7d50a9364107c21e3358e1dbc51a06359a5287fb.tar.gz
packages_apps_browser-7d50a9364107c21e3358e1dbc51a06359a5287fb.tar.bz2
Clear session cookies before attempting pre-login.
If ClientLogin issues session cookies, we do not want to clear them immediately after getting them from login. If we are not going to restore tabs, go ahead and clear the cookies before attempting pre-login. Keep track of the tab to restore so that we don't need to figure it out again. Requires a change in frameworks/base that exposes the CookieManager api. If we receive a 403 from IssueTokenAuth, inval the auth tokens and try again. Bug: 3421214 Change-Id: I5dd4cc0eba365a20a731ac43dd2571ef6274eaa9
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
-rw-r--r--src/com/android/browser/BrowserActivity.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index ec09673..899a7c2 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -111,12 +111,7 @@ public class BrowserActivity extends Activity {
icicle = state;
}
- final Bundle b = icicle;
- GoogleAccountLogin.startLoginIfNeeded(this, settings, new Runnable() {
- @Override public void run() {
- mController.start(b, getIntent());
- }
- });
+ mController.start(icicle, getIntent());
}
@VisibleForTesting