Merge "Show search results when query string contains trailing space" am: 8eb0c24e5a

am: 19000b747c

Change-Id: I250cc44ea08498ef751c3f9cf370b09b7cd0e39f

src/com/android/settings/search/Index.java

@@ -707,7 +707,7 @@ public class Index {
     }
 
     private String buildSearchMatchStringForColumns(String query, String[] columnNames) {
-        final String value = query + "*";
+        final String value = (query != null ? query.trim() : "") + "*";
         StringBuilder sb = new StringBuilder();
         final int count = columnNames.length;
         for (int n = 0; n < count; n++) {