commit 47a49225a43ea4d9bf266c800d54e3ec596ac497
author Winson Chung <winsonc@google.com> Fri May 15 19:15:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 19:15:43 2015 +0000
tree daa39f8397c8a3d229aa29b731f56a0c17b26afb
parent 5800e6bf8184a4411b73cdbc24a70792a4955adb
parent afa77e947d7b286c29cd6fc590b88d6cb425334f

am afa77e94: Don\'t try and trim null strings.

* commit 'afa77e947d7b286c29cd6fc590b88d6cb425334f':
  Don't try and trim null strings.

src/com/android/launcher3/Utilities.java

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");