From 4299e79da77d64be36c8f493f7555f1da6b14613 Mon Sep 17 00:00:00 2001 From: Andrei Onea Date: Fri, 6 Nov 2020 14:55:06 +0000 Subject: [PATCH] Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON Use @EnabledSince instead of @EnabledAfter for DISALLOW_DUPLICATE_FIELD_IN_SKELETON Test: m Bug: 172238506 Change-Id: I041e1e2694f310d638e31b475f29d0d214711dd5 --- core/java/android/text/format/DateFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 4a0bec1300b7d..07a22f6d8d0b8 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; /**