Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U"

2022-09-16 11:54:08 +00:00
parent 1ab7ac7f56 0d34d850fd
commit 643e586072
1 changed files with 1 additions and 1 deletions
--- 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;

    /**