Don't try and trim null strings.
Bug: 21161481
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index f3435fc..6734fdc 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -627,6 +627,10 @@
* Non-breaking whitespaces are also removed.
*/
public static String trim(CharSequence s) {
+ if (s == null) {
+ return null;
+ }
+
// Just strip any sequence of whitespace or java space characters from the beginning and end
Matcher m = sTrimPattern.matcher(s);
return m.replaceAll("$1");