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

Commit 19fd56d7 authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Change the API signature of DateTimePatternGenerator.getBestPattern"

parents 4f6c13a4 c8828ee5

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);

    }

    }





    /**

    /**