Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am: 5d84cbd007 am: f699773fbd" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-05-03 18:38:19 +00:00
committed by Android (Google) Code Review
parent 5eca7406f1 315612d912
commit c0e4d7e02b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -21807,7 +21807,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;

8
api/removed.txt
View File

@@ -280,6 +280,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 {