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

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

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

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

Change-Id: I3e42b7d61460be1415a3cba5f318f65cf3e77ba6
parents 22edbef1 19fd56d7

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

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

    }



    /**