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

Commit a0fe86bf authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e1 am:... 

Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e1 am: 81eb255f am: 0e6d9772 am: e945dc22

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

Change-Id: I276d4f6a2d46042e1342cd4f5801e2fd107cde41
parents e8b240f3 e945dc22

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

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.text.format; 
import android.annotation.NonNull;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.icu.text.DateFormatSymbols;
@@ -170,7 +170,7 @@ public class DateFormat { 
     * mean using 12-hour in some locales and, in this case, is duplicated as the 'a' field.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)

    static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L;



    /**