Merge "wifi: use Passpoint API when forgetting a Passpoint network"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6827e5b..5a7b42e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -699,7 +699,7 @@
<!-- Values for the list of long press timeout options. -->
<string-array name="long_press_timeout_selector_values" translatable="false">
- <item>500</item>
+ <item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
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++) {