From 9973b014896dffab79c8cffe48c5f8acee5d497e Mon Sep 17 00:00:00 2001
From: "long.x.qiao" <long.x.qiao@sonymobile.com>
Date: Tue, 29 Nov 2016 13:50:51 +0800
Subject: [PATCH] Show search results when query string contains trailing space

The query expression used to search for a term prefix is the prefix
itself with a '*' character appended to it. However, if query string
contains trailing space, the query expresssion (e.g. "screen *") doesn't
work. So to fix this issue, the unnecessary trailing space should be
removed.

Bug: 35231587
Test: manual - go to search in Settings and enter "screen "

Change-Id: Ifa5d96f5d38ad5454272f140da440b8ff55d5614
---
 src/com/android/settings/search/Index.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index 084f9c35fed..fe89d4f160b 100644
--- a/src/com/android/settings/search/Index.java
+++ b/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++) {