summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2016-05-18 00:02:11 +0200
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2016-05-31 15:28:59 -0700
commitd00168dcce2650e95aa4d9363ec256767720bee0 (patch)
tree20ac007c2f6046f5c143d0b0952588d9609ab98a /src
parenta7f5cf212800a52de5cf0b1e85b0f732141c88cf (diff)
downloadandroid_packages_apps_Trebuchet-d00168dcce2650e95aa4d9363ec256767720bee0.tar.gz
android_packages_apps_Trebuchet-d00168dcce2650e95aa4d9363ec256767720bee0.tar.bz2
android_packages_apps_Trebuchet-d00168dcce2650e95aa4d9363ec256767720bee0.zip
Trebuchet: Fix possible OOB
In some cases mText is empty and Substring will then throw an OOB Add logic to fix this (Reference: BugReports 13-20160506-12, Line #157) RM-232 Change-Id: I2b32b0a56a93977d34b780afb9b3047e9fa566b0 (cherry picked from commit 21115ac80f6d2c47b9f169904536830dfc8568b2)
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/AutoExpandTextView.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/launcher3/AutoExpandTextView.java b/src/com/android/launcher3/AutoExpandTextView.java
index ea7ac896e..4dd419975 100644
--- a/src/com/android/launcher3/AutoExpandTextView.java
+++ b/src/com/android/launcher3/AutoExpandTextView.java
@@ -197,11 +197,14 @@ public class AutoExpandTextView extends TextView {
SpannableStringBuilder builder = new SpannableStringBuilder();
for (HighlightedText highlightText : sections) {
- SpannableString spannable = new SpannableString(highlightText.mText.substring(0, 1));
- spannable.setSpan(
- new ForegroundColorSpan(highlightText.mHighlight ? highlightColor : grayColor),
- 0, spannable.length(), 0);
- builder.append(spannable);
+ if (!TextUtils.isEmpty(highlightText.mText)) {
+ SpannableString spannable =
+ new SpannableString(highlightText.mText.substring(0, 1));
+ spannable.setSpan(
+ new ForegroundColorSpan(highlightText.mHighlight ? highlightColor :
+ grayColor), 0, spannable.length(), 0);
+ builder.append(spannable);
+ }
}
setText(builder);