Stephen Smalley avatar Stephen Smalley committed dbe9967 Merge

Merge branch 'master' into seandroid

Comments (0)

Files changed (1)

core/java/android/text/format/DateUtils.java

      */
     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;
         }
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.