Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b446998 authored by Charles Munger's avatar Charles Munger Committed by android-build-merger
Browse files

Merge "Deprecate incorrect year constant" 

am: 9fbb152e

Change-Id: I5623253402d980b8c105b4fa7a4d622067eaa7fa
parents d7419344 9fbb152e

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }

core/java/android/text/format/DateUtils.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -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