commit a9843d95225c1734175299a7fd0e4237808ba2e8
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 08 14:52:04 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 08 14:52:04 2009 -0400
tree 10934e7a4e0480a09e0e82ea903bf6bb2cf25ed4
parent f5169178b774f1e602394403b1fe1fc45436e216
parent 7020282e345060d280be4f6aaaaa3e4a20ecad04

Merge change Ia16ab67e into eclair-mr2

* changes:
  Change the bookmark back to cnn.com.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 78664a0..45b2cdd 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2975,8 +2975,10 @@
             if (index > 0 && url.contains(".google.")) {
                 int end = url.indexOf('&', index);
                 if (end > 0) {
-                    url = url.substring(0, index-1).concat(url.substring(end));
+                    url = url.substring(0, index)
+                            .concat(url.substring(end + 1));
                 } else {
+                    // the url.charAt(index-1) should be either '?' or '&'
                     url = url.substring(0, index-1);
                 }
             }