summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2015-05-17 01:31:07 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-18 13:52:55 -0700
commite9df55f547d939acb767a0ab3f80feffaf8a8b7b (patch)
treeb6ab3b539a3368f381bcb70f052d0e5b5cf01b6b /src
parent233032cdf78d86b75e6a7c520e0e8535934f4512 (diff)
downloadandroid_packages_apps_Calendar-e9df55f547d939acb767a0ab3f80feffaf8a8b7b.tar.gz
android_packages_apps_Calendar-e9df55f547d939acb767a0ab3f80feffaf8a8b7b.tar.bz2
android_packages_apps_Calendar-e9df55f547d939acb767a0ab3f80feffaf8a8b7b.zip
Check date string size before trimming it
Change-Id: I69a29d5a0d3309bc84b8e6f2dbbcebc7addda0af
Diffstat (limited to 'src')
-rw-r--r--src/com/android/calendar/DayView.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 822e1581..6cc3b5a5 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -843,9 +843,10 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
for (int i = Calendar.SUNDAY; i <= Calendar.SATURDAY; i++) {
int index = i - Calendar.SUNDAY;
// e.g. Tue for Tuesday
- mDayStrs[index] = DateUtils.getDayOfWeekString(i, DateUtils.LENGTH_MEDIUM)
- .toUpperCase()
- .substring(0, 3);
+ String mediumDay = DateUtils.getDayOfWeekString(i, DateUtils.LENGTH_MEDIUM)
+ .toUpperCase();
+
+ mDayStrs[index] = mediumDay.substring(0, Math.min(mediumDay.length(), 3));
mDayStrs[index + 7] = mDayStrs[index];
// e.g. Tu for Tuesday