Merge "Deprecate incorrect year constant"

This commit is contained in:
Treehugger Robot
2019-12-12 22:56:13 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 2 deletions

View File

@@ -46810,7 +46810,7 @@ package android.text.format {
field public static final long WEEK_IN_MILLIS = 604800000L; // 0x240c8400L 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 = "%Y";
field public static final String YEAR_FORMAT_TWO_DIGITS = "%g"; 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[] sameMonthTable;
field @Deprecated public static final int[] sameYearTable; field @Deprecated public static final int[] sameYearTable;
} }

View File

@@ -56,8 +56,12 @@ public class DateUtils
public static final long DAY_IN_MILLIS = HOUR_IN_MILLIS * 24; public static final long DAY_IN_MILLIS = HOUR_IN_MILLIS * 24;
public static final long WEEK_IN_MILLIS = DAY_IN_MILLIS * 7; 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; public static final long YEAR_IN_MILLIS = WEEK_IN_MILLIS * 52;
// The following FORMAT_* symbols are used for specifying the format of // The following FORMAT_* symbols are used for specifying the format of