Merge "Change the API signature of DateTimePatternGenerator.getBestPattern"

2021-04-21 14:52:13 +00:00
parent 4f6c13a4c2 c8828ee59b
commit 19fd56d767
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/text/format/DateFormat.java
+++ b/core/java/android/text/format/DateFormat.java
@@ -267,7 +267,8 @@ public class DateFormat {
        DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(locale);
        boolean allowDuplicateFields = !CompatChanges.isChangeEnabled(
                DISALLOW_DUPLICATE_FIELD_IN_SKELETON);
-        return dtpg.getBestPattern(skeleton, allowDuplicateFields);
+        return dtpg.getBestPattern(skeleton, DateTimePatternGenerator.MATCH_NO_OPTIONS,
+                allowDuplicateFields);
    }

    /**