commit 55e849a5904425a1a54887bbd2d08b0fc52a68d1
author The Android Open Source Project <initial-contribution@android.com> Wed May 12 11:06:32 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed May 12 11:06:32 2010 -0700
tree af12fbb6a5e17cccd435d69040ffa12ec4aecff8
parent 6e37c92115b2f407972b190f337af8dab6a2ae19
parent 9fadc3a1966adaf27751a78ad5b3e5a653ca38c1

merge from open-source master

Change-Id: I53af51f3c14806f2302daeea62a125621851d2cc

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 2dac050..5350a18 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -960,6 +960,9 @@
                     } else if (url.startsWith("http://")) {
                         url = url.substring(4);
                     }
+                    // Escape wildcards for LIKE operator.
+                    url = url.replace("\\", "\\\\").replace("%", "\\%")
+                            .replace("_", "\\_");
                     Cursor c = null;
                     try {
                         final ContentResolver cr
@@ -967,7 +970,7 @@
                         url = "%" + url;
                         String [] selArgs = new String[] { url };
                         String where = Browser.BookmarkColumns.URL
-                                + " LIKE ? AND "
+                                + " LIKE ? ESCAPE '\\' AND "
                                 + Browser.BookmarkColumns.BOOKMARK + " = 0";
                         c = cr.query(Browser.BOOKMARKS_URI, new String[]
                                 { Browser.BookmarkColumns._ID }, where, selArgs,