| commit | 0d34d850fda5dd63b53058fa618e7c66761014be | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Tue Sep 13 15:29:49 2022 +0100 |
| committer | Victor Chang <vichang@google.com> | Tue Sep 13 15:49:09 2022 +0100 |
| tree | 2ddf8ed4004422bd40bcb62348623408805adb75 | |
| parent | 2e933599ed7eb8842bf2d51edd845819cdd0af84 [diff] |
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
diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 537dffc..d48d566 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java
@@ -170,7 +170,7 @@ * 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; /**