From 0d34d850fda5dd63b53058fa618e7c66761014be Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 13 Sep 2022 15:29:49 +0100 Subject: [PATCH] Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U It was supposed to be enabled in S, but we missed it due to https://r.android.com/1490737 Test: android.text.format.DateFormatTest Change-Id: I0f6495bf2e4434396606743da1e32a39a54a0b19 --- core/java/android/text/format/DateFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 537dffc4abf15..d48d566fd860d 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -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 - @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT) + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L; /**