commit 8eb0c24e5aacb7cd14dc6fec789a20b6a63f4193
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 01 19:20:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 01 19:20:26 2017 +0000
tree 39071422dbdfcdd05fc8f2b004d1ad5e5ed04009
parent 05c88316ec2590465cf9337dd34cf9763008bd37
parent 9973b014896dffab79c8cffe48c5f8acee5d497e

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

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

diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index 084f9c35..fe89d4f 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -707,7 +707,7 @@
     }
 
     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++) {