Merge "Show search results when query string contains trailing space"

am: 8eb0c24e5a

Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f

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++) {