summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author vichang <vichang@google.com> 2021-04-21 14:52:13 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-21 14:52:13 +0000
commit19fd56d767104e97db11b55f950f11bbbeeba233 (patch)
treeef885e8661ac86a7c364ddb360133489af60dd97
parent4f6c13a4c2c474f2e08bd42033b30e9fe3756c93 (diff)
parentc8828ee59b509e9515e26beca479e419f506a01b (diff)
Merge "Change the API signature of DateTimePatternGenerator.getBestPattern"
-rwxr-xr-xcore/java/android/text/format/DateFormat.java3
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);
}
/**