diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /core/java/android/webkit/CookieManager.java | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'core/java/android/webkit/CookieManager.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 |