am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced': Fix 5654631. It forgot to consider the year in formatDateRange.
2011-11-22 17:46:35 -08:00
parent d49a56ce64 8bb56180d2
commit 85c38af1d4
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -1415,7 +1415,7 @@ public class DateUtils
            }
        }

-        if (noMonthDay && startMonthNum == endMonthNum) {
+        if (noMonthDay && startMonthNum == endMonthNum && startYear == endYear) {
            // Example: "January, 2008"
            return formatter.format("%s", startDate.format(defaultDateFormat));
        }