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

Commit 8b2caae3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Deprecate internal Calendar methods." am: e08bd750 am:... 

Merge "Merge "Deprecate internal Calendar methods." am: e08bd750 am: 5144cd44 am: 30ce9c07" into oc-dev-plus-aosp
parents 9e8ce104 4652da84

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19283,9 +19283,9 @@ package android.icu.util { 
    method protected final void computeGregorianFields(int);

    method protected int computeGregorianMonthStart(int, int);

    method protected int computeJulianDay();

    method protected int computeMillisInDay();

    method protected deprecated int computeMillisInDay();

    method protected void computeTime();

    method protected int computeZoneOffset(long, int);

    method protected deprecated int computeZoneOffset(long, int);

    method public int fieldDifference(java.util.Date, int);

    method protected java.lang.String fieldName(int);

    method protected static final long floorDivide(long, long);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -20785,9 +20785,9 @@ package android.icu.util { 
    method protected final void computeGregorianFields(int);

    method protected int computeGregorianMonthStart(int, int);

    method protected int computeJulianDay();

    method protected int computeMillisInDay();

    method protected deprecated int computeMillisInDay();

    method protected void computeTime();

    method protected int computeZoneOffset(long, int);

    method protected deprecated int computeZoneOffset(long, int);

    method public int fieldDifference(java.util.Date, int);

    method protected java.lang.String fieldName(int);

    method protected static final long floorDivide(long, long);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19333,9 +19333,9 @@ package android.icu.util { 
    method protected final void computeGregorianFields(int);

    method protected int computeGregorianMonthStart(int, int);

    method protected int computeJulianDay();

    method protected int computeMillisInDay();

    method protected deprecated int computeMillisInDay();

    method protected void computeTime();

    method protected int computeZoneOffset(long, int);

    method protected deprecated int computeZoneOffset(long, int);

    method public int fieldDifference(java.util.Date, int);

    method protected java.lang.String fieldName(int);

    method protected static final long floorDivide(long, long);