Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the API signature of DateTimePatternGenerator.getBestPattern" am: 19fd56d767 am: a1335e23ac

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662460

Change-Id: I5fc5dd8a7978c04c514ad874f2a7754477d0d2bb
This commit is contained in:
vichang
2021-04-21 15:45:27 +00:00
committed by Automerger Merge Worker
parent 807284da27 a1335e23ac
commit c080e7f7f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/text/format/DateFormat.java
View File

@@ -267,7 +267,8 @@ public class DateFormat {
DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(locale); DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(locale);
boolean allowDuplicateFields = !CompatChanges.isChangeEnabled( boolean allowDuplicateFields = !CompatChanges.isChangeEnabled(
DISALLOW_DUPLICATE_FIELD_IN_SKELETON); DISALLOW_DUPLICATE_FIELD_IN_SKELETON);
return dtpg.getBestPattern(skeleton, allowDuplicateFields); return dtpg.getBestPattern(skeleton, DateTimePatternGenerator.MATCH_NO_OPTIONS,
allowDuplicateFields);
} }
/** /**