drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a8be3cf: am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."

Browse Source 
* commit '2a8be3cf5ebabbbb0c42d946f28cfe33d5653be6':
  Fix NPE in DateFormat.is24HourFormat.
This commit is contained in:
Elliott Hughes
2013-08-16 14:20:50 -07:00
committed by Android Git Automerger
parent 0210bf0862 2a8be3cf5e
commit ae73645241
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/text/format/DateUtils.java
View File

@ -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;
}