diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-16 21:14:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-16 21:14:19 +0000 |
| commit | ecdf20d4fec6107ee49e315cff3dc73f65569843 (patch) | |
| tree | 974a79d7a8c04ade1eae1068ea596ebfa5080661 /core/java/android/text | |
| parent | 82461951c3bddd5e6873dbb66703b838cbb66b2c (diff) | |
| parent | 8d8ef00c8276200f108433922761401817fd9a50 (diff) | |
| download | frameworks_base-ecdf20d4fec6107ee49e315cff3dc73f65569843.zip frameworks_base-ecdf20d4fec6107ee49e315cff3dc73f65569843.tar.gz frameworks_base-ecdf20d4fec6107ee49e315cff3dc73f65569843.tar.bz2 | |
Merge "Fix NPE in DateFormat.is24HourFormat."
Diffstat (limited to 'core/java/android/text')
| -rw-r--r-- | core/java/android/text/format/DateUtils.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 2b805a9..22675b4 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -816,9 +816,10 @@ public class DateUtils */ public static Formatter formatDateRange(Context context, Formatter formatter, long startMillis, long endMillis, int flags, String timeZone) { - // icu4c will fall back to the locale's preferred 12/24 format, + // If we're being asked to format a time without being explicitly told whether to use + // the 12- or 24-hour clock, icu4c will fall back to the locale's preferred 12/24 format, // but we want to fall back to the user's preference. - if ((flags & (FORMAT_12HOUR | FORMAT_24HOUR)) == 0) { + if ((flags & (FORMAT_SHOW_TIME | FORMAT_12HOUR | FORMAT_24HOUR)) == FORMAT_SHOW_TIME) { flags |= DateFormat.is24HourFormat(context) ? FORMAT_24HOUR : FORMAT_12HOUR; } |