diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-11 14:04:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-11 14:04:10 -0700 |
| commit | e292086e6b5124a8e6b9435609d41c9ab2ef5e22 (patch) | |
| tree | 5bd27d32451decee89bed50b29aa4928fb993ea6 /core/java | |
| parent | 25fdf352d40476e8d87cea44e73581a86dda208d (diff) | |
| parent | 6b4e4275d374e47e4b87b57bbabf94d5dd55e7b3 (diff) | |
| download | frameworks_base-e292086e6b5124a8e6b9435609d41c9ab2ef5e22.zip frameworks_base-e292086e6b5124a8e6b9435609d41c9ab2ef5e22.tar.gz frameworks_base-e292086e6b5124a8e6b9435609d41c9ab2ef5e22.tar.bz2 | |
Merge change 1391 into donut
* changes:
Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/CookieManager.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index c0c6775..e8c2279 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -647,8 +647,6 @@ public final class CookieManager { // another file in the local web server directory. Still // "localhost" is the best pseudo domain name. ret[0] = "localhost"; - } else if (!ret[0].equals("localhost")) { - return null; } } else if (index == ret[0].lastIndexOf(PERIOD)) { // cookie host must have at least two periods |