Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON"

Browse Source
This commit is contained in:
Andrei-Valentin Onea
2020-11-09 14:58:38 +00:00
committed by Gerrit Code Review
parent f8abe13db4 4299e79da7
commit 5bba56e147
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/format/DateFormat.java
View File

@@ -19,7 +19,7 @@ package android.text.format;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.compat.CompatChanges; import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter; import android.compat.annotation.EnabledSince;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.icu.text.DateFormatSymbols; 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. * mean using 12-hour in some locales and, in this case, is duplicated as the 'a' field.
*/ */
@ChangeId @ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R) @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)
static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L; static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L;
/** /**