diff options
| author | Patrick Scott <phanna@android.com> | 2011-02-02 09:36:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 09:36:05 -0800 |
| commit | 9a8e2948fdb23b027994c90219419f0a0831253e (patch) | |
| tree | 08db797237244e9cdea1ee2fa8b17718fda20e8c /src | |
| parent | 637cd5af093fb4e7a1b8879059b2491c3537d037 (diff) | |
| parent | ab6db07a013d4de75b764a35336f8c10bb310b56 (diff) | |
| download | packages_apps_Browser-9a8e2948fdb23b027994c90219419f0a0831253e.tar.gz packages_apps_Browser-9a8e2948fdb23b027994c90219419f0a0831253e.tar.bz2 packages_apps_Browser-9a8e2948fdb23b027994c90219419f0a0831253e.zip | |
am ab6db07a: am 71b1713b: Hack to fix hosted accounts.
* commit 'ab6db07a013d4de75b764a35336f8c10bb310b56':
Hack to fix hosted accounts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/GoogleAccountLogin.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/browser/GoogleAccountLogin.java b/src/com/android/browser/GoogleAccountLogin.java index 6bec8dc8e..f019b52a6 100644 --- a/src/com/android/browser/GoogleAccountLogin.java +++ b/src/com/android/browser/GoogleAccountLogin.java @@ -280,13 +280,15 @@ public class GoogleAccountLogin extends Thread implements return false; } + // Use /a/ to grab hosted cookies as well as the base set of google.com + // cookies. String cookies = CookieManager.getInstance().getCookie( - "http://www.google.com"); + "http://www.google.com/a/"); if (cookies != null) { StringTokenizer tokenizer = new StringTokenizer(cookies, ";"); while (tokenizer.hasMoreTokens()) { String cookie = tokenizer.nextToken().trim(); - if (cookie.startsWith("SID=")) { + if (cookie.startsWith("SID=") || cookie.startsWith("ASIDAP=")) { return true; } } |