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

Merge "Deprecate incorrect year constant" am: 9fbb152eb2 am: 2b446998a1

Browse Source 
Change-Id: I26f759d358c273657f0a0eba180968463e46ac44
This commit is contained in:
Automerger Merge Worker
2019-12-12 23:39:47 +00:00
parent 675c99fbe4 2b446998a1
commit 2c8f4df701
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -46819,7 +46819,7 @@ package android.text.format {
field public static final long WEEK_IN_MILLIS = 604800000L; // 0x240c8400L
field public static final String YEAR_FORMAT = "%Y";
field public static final String YEAR_FORMAT_TWO_DIGITS = "%g";
field public static final long YEAR_IN_MILLIS = 31449600000L; // 0x7528ad000L
field @Deprecated public static final long YEAR_IN_MILLIS = 31449600000L; // 0x7528ad000L
field @Deprecated public static final int[] sameMonthTable;
field @Deprecated public static final int[] sameYearTable;
}

6
core/java/android/text/format/DateUtils.java
View File

@@ -56,8 +56,12 @@ public class DateUtils
public static final long DAY_IN_MILLIS = HOUR_IN_MILLIS * 24;
public static final long WEEK_IN_MILLIS = DAY_IN_MILLIS * 7;
/**
* This constant is actually the length of 364 days, not of a year!
* @deprecated Not all years have the same number of days, and this constant is actually the
* length of 364 days. Please use other date/time constructs such as
* {@link java.util.concurrent.TimeUnit}, {@link java.util.Calendar} or
* {@link java.time.Duration} instead.
*/
@Deprecated
public static final long YEAR_IN_MILLIS = WEEK_IN_MILLIS * 52;
// The following FORMAT_* symbols are used for specifying the format of