Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c080e7f7 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Change the API signature of DateTimePatternGenerator.getBestPattern"... 

Merge "Change the API signature of DateTimePatternGenerator.getBestPattern" am: 19fd56d7 am: a1335e23

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

Change-Id: I5fc5dd8a7978c04c514ad874f2a7754477d0d2bb
parents 807284da a1335e23

core/java/android/text/format/DateFormat.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);

    }

    }





    /**

    /**