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

Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147 am: 81eb255fa2 am: 0e6d9772c2 am: e945dc22c0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: I276d4f6a2d46042e1342cd4f5801e2fd107cde41
This commit is contained in:
Andrei-Valentin Onea
2020-11-09 16:33:13 +00:00
committed by Automerger Merge Worker
parent e8b240f35a e945dc22c0
commit a0fe86bf15
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.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;
@@ -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
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)
@EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)
static final long DISALLOW_DUPLICATE_FIELD_IN_SKELETON = 170233598L;
/**