diff options
| author | 2021-04-21 15:45:27 +0000 | |
|---|---|---|
| committer | 2021-04-21 15:45:27 +0000 | |
| commit | c080e7f7f9cc024ec4b850d3594cc3fc4f7e2392 (patch) | |
| tree | 63280856f8f6c486c594239505f5fcadf6659837 | |
| parent | 807284da27f92719dae5904d727a1b9607c1f234 (diff) | |
| parent | a1335e23ace6d23c6e3601a663724666372d1506 (diff) | |
Merge "Change the API signature of DateTimePatternGenerator.getBestPattern" am: 19fd56d767 am: a1335e23ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662460
Change-Id: I5fc5dd8a7978c04c514ad874f2a7754477d0d2bb
| -rwxr-xr-x | core/java/android/text/format/DateFormat.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 8900dfd30f47..c80c025d93dd 100755 --- 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); } /** |