From f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 23 Oct 2014 11:06:43 -0700 Subject: Migrate off timeFormat12 and timeFormat24. libcore now offers a wider variety of 12-/24-hour time formats, so be more specific about which one we want here. (cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.) Bug: 10361358 Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530 --- core/java/android/text/format/DateFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/text') diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 9fec9a1..d48f551 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -216,7 +216,7 @@ public class DateFormat { */ public static String getTimeFormatString(Context context) { LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale); - return is24HourFormat(context) ? d.timeFormat24 : d.timeFormat12; + return is24HourFormat(context) ? d.timeFormat_Hm : d.timeFormat_hm; } /** -- cgit v1.1