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

Commit 5d84cbd0 authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"

parents 355f9f77 8d69313c

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -20930,7 +20930,6 @@ package android.icu.util { 
    ctor public JapaneseCalendar(int, int, int, int);

    ctor public JapaneseCalendar(int, int, int, int);

    ctor public JapaneseCalendar(int, int, int);

    ctor public JapaneseCalendar(int, int, int);

    ctor public JapaneseCalendar(int, int, int, int, int, int);

    ctor public JapaneseCalendar(int, int, int, int, int, int);

    field @Deprecated public static final int CURRENT_ERA;

    field public static final int HEISEI;

    field public static final int HEISEI;

    field public static final int MEIJI;

    field public static final int MEIJI;

    field public static final int SHOWA;

    field public static final int SHOWA;

api/removed.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -275,6 +275,14 @@ package android.hardware { 




}

}





package android.icu.util {



  public class JapaneseCalendar extends android.icu.util.GregorianCalendar {

    field public static final int CURRENT_ERA;

  }



}



package android.location {

package android.location {





  public class Location implements android.os.Parcelable {

  public class Location implements android.os.Parcelable {