diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-08 09:54:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-08 09:54:08 -0800 |
| commit | 529b2854de028a79dff45583112723a9791430c9 (patch) | |
| tree | f9749ca244c0459e053000364be07f6782696ad6 | |
| parent | 08d5b1fdefef9ebb52906fd034040008001c94c3 (diff) | |
| parent | 2807dbd5942a64eb0200de3c2ea0f551a22720f3 (diff) | |
| download | frameworks_base-529b2854de028a79dff45583112723a9791430c9.zip frameworks_base-529b2854de028a79dff45583112723a9791430c9.tar.gz frameworks_base-529b2854de028a79dff45583112723a9791430c9.tar.bz2 | |
Merge "If both cookies have null values, use the name difference."
| -rw-r--r-- | core/java/android/webkit/CookieManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index 379b425..427ce76 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -219,7 +219,11 @@ public final class CookieManager { // If cookie2 has a null value, it should come later in // the list. if (cookie2.value == null) { - return -1; + // If both cookies have null values, fall back to using the name + // difference. + if (cookie1.value != null) { + return -1; + } } else if (cookie1.value == null) { // Now we know that cookie2 does not have a null value, if // cookie1 has a null value, place it later in the list. |