commit 2a1d4ed54feb26405c0c6253df5431303cedefa8
author Winson Chung <winsonc@google.com> Thu Jun 25 10:05:54 2015 -0700
committer Winson Chung <winsonc@google.com> Thu Jun 25 10:05:54 2015 -0700
tree e70a0b62fe1ca1b441efabcf8d59494f9350a19b
parent 4c7fc62ae2f8c7bee397815deaa488c3cb6a2f76

Fixing crash when using app name comparator with empty titles.

Bug: 22065752
Change-Id: I4160f5e1728e46ce85fd2579889e7952de01a752

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) {