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

Commit 267b7879 authored by Joachim Sauer's avatar Joachim Sauer Committed by android-build-merger
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
am: 8b2caae3

Change-Id: I7ef1ace4a696dc5b57ad42b7756e0e3a6efa5c83
parents a1dbe18a 8b2caae3

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19286,9 +19286,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
@@ -20789,9 +20789,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
@@ -19336,9 +19336,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);