commit c5b7da7ec6588ce057d921abf73915a62ef66cf2
author Iliyan Malchev <malchev@google.com> Wed Oct 07 21:09:41 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 07 21:09:41 2009 -0700
tree ac5bb615f7dc8a73ad5420dd6e69e6f98603dc5a
parent fcdae3b8a6353182c66600b9cad047762b70cefc
parent 72282792dd668d37e1bba9d9ca0f631ffe74219e

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp

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);
                 }
             }