commit 051527fd540efc1de476cb1951ca637a158718d0
author Winson Chung <winsonc@google.com> Thu Jun 25 17:11:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 17:11:09 2015 +0000
tree 0c43da8d68752b9760fced1ccaca706c832f625c
parent 9063bfaad00de340bc614e677c1a3eeaadc7e433
parent 2a1d4ed54feb26405c0c6253df5431303cedefa8

Merge "Fixing crash when using app name comparator with empty titles." into ub-launcher3-burnaby

src/com/android/launcher3/model/AppNameComparator.java

diff --git a/src/com/android/launcher3/model/AppNameComparator.java b/src/com/android/launcher3/model/AppNameComparator.java
index cd45d2c..c4b74d4 100644
--- a/src/com/android/launcher3/model/AppNameComparator.java
+++ b/src/com/android/launcher3/model/AppNameComparator.java
@@ -85,8 +85,10 @@
      */
     @Thunk int compareTitles(String titleA, String titleB) {
         // Ensure that we de-prioritize any titles that don't start with a linguistic letter or digit
-        boolean aStartsWithLetter = Character.isLetterOrDigit(titleA.codePointAt(0));
-        boolean bStartsWithLetter = Character.isLetterOrDigit(titleB.codePointAt(0));
+        boolean aStartsWithLetter = (titleA.length() > 0) &&
+                Character.isLetterOrDigit(titleA.codePointAt(0));
+        boolean bStartsWithLetter = (titleB.length() > 0) &&
+                Character.isLetterOrDigit(titleB.codePointAt(0));
         if (aStartsWithLetter && !bStartsWithLetter) {
             return -1;
         } else if (!aStartsWithLetter && bStartsWithLetter) {