diff options
| author | Winson Chung <winsonc@google.com> | 2015-06-25 10:05:54 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2015-06-25 10:05:54 -0700 |
| commit | 2a1d4ed54feb26405c0c6253df5431303cedefa8 (patch) | |
| tree | e70a0b62fe1ca1b441efabcf8d59494f9350a19b /src/com/android/launcher3/model | |
| parent | 4c7fc62ae2f8c7bee397815deaa488c3cb6a2f76 (diff) | |
| download | android_packages_apps_Trebuchet-2a1d4ed54feb26405c0c6253df5431303cedefa8.tar.gz android_packages_apps_Trebuchet-2a1d4ed54feb26405c0c6253df5431303cedefa8.tar.bz2 android_packages_apps_Trebuchet-2a1d4ed54feb26405c0c6253df5431303cedefa8.zip | |
Fixing crash when using app name comparator with empty titles.
Bug: 22065752
Change-Id: I4160f5e1728e46ce85fd2579889e7952de01a752
Diffstat (limited to 'src/com/android/launcher3/model')
| -rw-r--r-- | src/com/android/launcher3/model/AppNameComparator.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/model/AppNameComparator.java b/src/com/android/launcher3/model/AppNameComparator.java index cd45d2c94..c4b74d4dc 100644 --- a/src/com/android/launcher3/model/AppNameComparator.java +++ b/src/com/android/launcher3/model/AppNameComparator.java @@ -85,8 +85,10 @@ public class AppNameComparator { */ @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) { |