From e9df55f547d939acb767a0ab3f80feffaf8a8b7b Mon Sep 17 00:00:00 2001 From: Stephen Bird Date: Sun, 17 May 2015 01:31:07 -0700 Subject: Check date string size before trimming it Change-Id: I69a29d5a0d3309bc84b8e6f2dbbcebc7addda0af --- src/com/android/calendar/DayView.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') 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 -- cgit v1.2.3