diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2020-11-09 15:59:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 15:59:58 +0000 |
| commit | e945dc22c0bcc290ae119c2f0147f9986e5ed47a (patch) | |
| tree | e7a9b2b46480453053a3ac08b5729b12a042be9e | |
| parent | a176e55214c08b8878ddb42abeaf42972725beab (diff) | |
| parent | 0e6d9772c2f3f5025fb8be1d5510aba0c88326bf (diff) | |
Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147 am: 81eb255fa2 am: 0e6d9772c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737
Change-Id: I264b82318fb8331f85811a3d45c589d3c2bfeba9
| -rwxr-xr-x | core/java/android/text/format/DateFormat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 640259e0e7eb..8900dfd30f47 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -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; @@ -169,7 +169,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; /** |