commit 72282792dd668d37e1bba9d9ca0f631ffe74219e
author Grace Kloba <klobag@google.com> Wed Oct 07 21:03:58 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 07 21:03:58 2009 -0700
tree f9e291f903e7ee61adb406edd6002c64b042e301
parent 955331e3664de84d5a7bdbb25b2cee416af206a7
parent ef2921584e0c2f425d673dfd2c912b287a6faa5a

am ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.

Merge commit 'ef2921584e0c2f425d673dfd2c912b287a6faa5a' into eclair-plus-aosp

* commit 'ef2921584e0c2f425d673dfd2c912b287a6faa5a':
  We should handle all four cases when strip the "client".

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1e7361b..65b7911 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2981,8 +2981,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);
                 }
             }