diff options
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/Controller.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/GoogleAccountLogin.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index a2ddc8c..07e1ef9 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -568,6 +568,9 @@ public class Controller } protected void onPause() { + if (mUi.isCustomViewShowing()) { + hideCustomView(); + } if (mActivityPaused) { Log.e(LOGTAG, "BrowserActivity is already paused."); return; diff --git a/src/com/android/browser/GoogleAccountLogin.java b/src/com/android/browser/GoogleAccountLogin.java index 6bec8dc..f019b52 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; } } |