summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-02-02 11:18:56 -0500
committerPatrick Scott <phanna@android.com>2011-02-02 11:18:56 -0500
commit71b1713b9706b068e38202ac1ed7d87c7badfae4 (patch)
tree9457c3683042ed68dc24e2898a32b045a60872a7 /src/com/android
parentb577d6ebd2e3edaffd838c4b58d882ca7018198b (diff)
downloadpackages_apps_Browser-71b1713b9706b068e38202ac1ed7d87c7badfae4.tar.gz
packages_apps_Browser-71b1713b9706b068e38202ac1ed7d87c7badfae4.tar.bz2
packages_apps_Browser-71b1713b9706b068e38202ac1ed7d87c7badfae4.zip
Hack to fix hosted accounts.
Search for ASIDAP using the /a/ path to find a hosted account. Bug: 3396570 Change-Id: I10cbc7f337532d59e405804724e6bc0be4e669d8
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/GoogleAccountLogin.java6
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;
}
}