| commit | ef2921584e0c2f425d673dfd2c912b287a6faa5a | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Wed Oct 07 19:15:59 2009 -0700 |
| committer | Grace Kloba <klobag@google.com> | Wed Oct 07 19:15:59 2009 -0700 |
| tree | f9e291f903e7ee61adb406edd6002c64b042e301 | |
| parent | 9a5b829ca96b386231ceb927d3dcff40d81ddca3 [diff] |
We should handle all four cases when strip the "client". We were incorrect in the third case. http://www.google.com/m?client=ms-unknown http://www.google.com/m?hl=en&client=ms-unknown http://www.google.com/m?client=ms-unknown&q=pizza http://www.google.com/m?hl=en&client=ms-unknown&q=pizza Fix http://b/issue?id=2174396
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); } }