Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user