5f90065cde808c9ac3c5c08bd3835b3d8cfe3300 |
|
04-May-2017 |
Tobias Thierer <tobiast@google.com> |
Improve Android-changed documentation for removal of ZoneInfo This CL adds documentation for previously undocumented Android changes in AbstractCalendar, and makes the change comments consistent. sun.util.calendar.ZoneInfo appears to never have been available on Android. Libcore commit 9c853c5b9ebbb0ef60a013ae10ee411d70dfa832 back in 2015 made corresponding Android changes to the OpenJDK code that was ported, but those changes were not documented at the time. Bug: 35910877 Test: Treehugger build succeeds. Change-Id: I4842885ebb5a0272f545cea459413155fb98e6dc
|
aa3cc81fcb0d35faa9a51d6bf59d48685fd4d16a |
|
03-Mar-2017 |
Tobias Thierer <tobiast@google.com> |
Misc tweaks to Android-changed documentation in java.util Makes Android-changed documentation in java.util more consistent with the style guide. This CL contains no behavior changes. Test: make droid cts Bug: 35841464 Change-Id: If0fac577b90d77bc5ff86b784d4b9fa5ef1c5a8a
|
6975f84c2ed72e1e26d20190b6f318718c849008 |
|
01-Mar-2017 |
Tobias Thierer <tobiast@google.com> |
Make Android patch docs in ojluni more consistent with style guide This CL consists of an automated and a manual part (originally reviewed as separate CLs, then squashed together before submitting in order to minimize the number of times each Android-changed line is touch, since that makes future git archaeology on these simpler). Automated part: Run the following command (performs regex replacements): find ojluni -name \*\.java | xargs sed -i \ -e 's/Android[- ]changed/Android-changed/ig' \ -e 's/Android-changed :/Android-changed:/g' \ -e 's/Android-changed \(BEGIN\|END\)/\1 Android-changed/g' \ -e 's/Android-changed - /Android-changed: /g' \ -e 's/Android[- ]removed/Android-removed/ig' \ -e 's/Android-removed :/Android-removed:/g' \ -e 's/Android-removed \(BEGIN\|END\)/\1 Android-removed/g' \ -e 's/Android-removed - /Android-removed: /g' \ -e 's/Android[- ]added/Android-added/ig' \ -e 's/Android-added :/Android-added:/g' \ -e 's/Android-added \(BEGIN\|END\)/\1 Android-added/g' \ -e 's/Android-added - /Android-added: /g' \ -e 's/----- \(BEGIN\|END\) android\( -----\)\?/\1 Android-changed/g' \ -e 's/\/\* \(BEGIN\|END\) Android-changed \*\//\/\/ \1 Android-changed/g' Manual part: Move BEGIN Android-* lines out of block comments Some Android-{changed,removed,added} lines occurred inside block comments. This CL targets places in ojluni that contained the String "* BEGIN Android-" Changes made by this CL include: - Move the "BEGIN Android-" line into a line comment (the style guide mandates that "Android-" lines are always in line comments). In many cases, that line comment is immediately followed by a block comment holding commented-out upstream code. - Add corresponding "// END Android-" line comments, where missing. - Drop documented import changes altogether. These create noise for little benefit: (1.) Most import problems will be found at compile time (2.) They generally correspond to documented changes elsewhere in the file. - In most cases, the phrasing of comments and the decision whether to keep commented out upstream code was not changed by this CL. - Some additional tweaks were made in line with the style guide. No attempt was made to: - Verify that commented-out upstream code actually matches the current upstream. - Make any fixes (eg. to comments) that would have required git archaeology (looking up historic commits). Bug: 35841464 Test: make droid cts update-api Change-Id: Ibc60979cb6061cfb0e9c7096cc9dcab30ddfa733
|
21c40e1463c0026f5df4faa5b17cb34ed4ec267c |
|
15-Feb-2017 |
Tobias Thierer <tobiast@google.com> |
Document Android changes/additions vs. upstream in Calendar.java - Add missing comments for Android additions/changes - Clarify the extent of changes with existing comments by introducing BEGIN/END lines. - Fix typo in Android-added @hide method name getJapanesImperialInstance() Consideration whether each change is correct or should be upstreamed is not part of this CL. Bug: 35235723 Test: make droid cts Change-Id: I5fa9565162b62c1d4ce51875c7b83a000ef1b289
|
ca09f396de0e27f72cd66683e7db8941dc1c97e2 |
|
14-Feb-2017 |
Neil Fuller <nfuller@google.com> |
Revert "Revert "Add unit tests to Calendar.Builder."" This reverts commit 818caf98f0b396b56bef2d6ec05d718bfb6b5f71. Change-Id: I8bdef684aa13614aa4e332fd7437cf19ad47594b
|
818caf98f0b396b56bef2d6ec05d718bfb6b5f71 |
|
13-Feb-2017 |
Tobias Thierer <tobiast@google.com> |
Revert "Add unit tests to Calendar.Builder." Pushed core-tests over dex's 64k method limit. Reverting temporarily as a workaround to get the automated tests running until we can fix the root cause. Bug: http://b/35308152 Test: Treehugger builds successfully. This reverts commit 07f8657dec162314b50f8ba7d7bf656916e870b7. Change-Id: Ie2fda27582c9b69baea3515bdf703f229a78e5b4
|
07f8657dec162314b50f8ba7d7bf656916e870b7 |
|
10-Feb-2017 |
Joachim Sauer <jsauer@google.com> |
Add unit tests to Calendar.Builder. Also fixes a bug where Calendar.Builder for the th_TH locale would throw an unexpected exception and fixes a typo in a JavaDoc example. Bug: 34923731 Test: run cts -m CtsLibcoreTestCases Change-Id: I8ab65535a807eee6898b19fe2747935df31a0a32
|
dc4414b90a99639a0701c321472e29200b7ae0a0 |
|
24-Nov-2016 |
Joachim Sauer <jsauer@google.com> |
Improve CalendarDataUtils. Support ALL_STYLES which is used for parsing when no specific style is required. Don't return a Map for fields where names are ambiguous (mostly happens when the style is NARROW). Allow getDisplayName() to be used with ALL_STYLES as an alias to SHORT. Modify CalendarTest to allow getDisplayNames with ALL_STYLES to return more values than SHORT and LONG together (due to narrow styles). Bug: 28832222 Test: artrun testng-time.xml Test: CtsLibcoreTestCases Change-Id: Iebde1c442380e7359af8dc369906092861b845cf
|
3866c080537c37ff7bd246b8d7b1651cd83a07c3 |
|
21-Nov-2016 |
Joachim Sauer <jsauer@google.com> |
Fix Japanese Chronology. The JapaneseChronology class depends on the ImperialJapaneseCalendar being returned by Calendard.getInstance(). Since Android always returns a GregorianCalendar from that class, the tests will fail. This fixes the problem by importing the JapaneseImperialCalendar class from the OpenJDK (with minor tweaks to remove mentions of the ZoneInfo class) and adapting the relevant classes to use a new explicit method on Calendar to request such a calendar instance. Also apply update LocaleGregorianCalendar to jdk8u60 which fixes an off-by-one error in calculations related to eras. Added ChronologyDisplayNameTest to ensure future Chronologies return sane values for their display name and their eras display names. Bug: 28832222 Test: artrun testng-time.xml Test: run cts -m CtsLibcoreTestCases Change-Id: I3eb5d4509ad03ee3d736c7926c605f378b56d0b2
|
d7928577b0cc656c1c6da16bfe281541fdd435ee |
|
13-Oct-2016 |
Joachim Sauer <jsauer@google.com> |
Make java.time compile. This involves several mostly unrelated changes that nontheless don't make sense to apply individually: - Merge changes from OpenJDK8u60 to j.u.Calendar, j.u.GregorianCalendar, j.u.TimeZone, sun.util.calendar.BaseCalendar and CalendarSystem. These depend on changes in java.time, so they weren't done earlier and some java.time classes depend on them. - Replace name lookups with ICU resource lookups where a direct replacement exist. - Stub out name lookups where the ICU equivalent is non-trivial (will be added in later commit) Bug: 28832222 Test: CtsLibcoreTestCases (2 failures due to Calendar.getDisplayName() being unimplemented) Change-Id: I77ed768b01ab0701c807145466e0f1d5d217a6d5
|
49965c1dc9da104344f4893a05e45795a5740d20 |
|
30-Jun-2016 |
Ganesh Mahendran <opensource.ganesh@gmail.com> |
remove x attribute of java file java file does not need x attribute. This patch removes it. Change-Id: I2a7170d99f4bee7a7b819621c84dd197ded37fa2 Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
|
3f3582d1853c053a9002cd6850ffb40ec7864e4c |
|
19-Jan-2016 |
Paul Duffin <paulduffin@google.com> |
Fix NullPointerException in Calendar constructor The test_nulllocale checked three different cases so I split it into three separate tests. They all failed in the same way so I fixed them in the common place. Although the tests had a TODO to add a targetSdkVersion check I did not do that. Bug: 26022884 Change-Id: Icab2b4c834609a0b0f84f5f86570067019688611
|
7e2649e490f1da8c6c859a6c76d2199e1d9fb516 |
|
04-Jan-2016 |
Yi Kong <yikong@google.com> |
Check for leniency of calendar in getDisplayNames and throw IllegalArgumentException if any of the calendar fields have invalid values, as it is explicitly required by the Java spec. Bug: 25998856 Change-Id: I66b9330ab2fc63bf56cb079705f6cf7c9dbb955e
|
2c87ad3a45cecf9e344487cad1abfdebe79f2c7c |
|
21-Dec-2015 |
Narayan Kamath <narayan@google.com> |
Update file headers. Change-Id: I8149f41585768a1a4b72ab7bb4a1452376c05cc2
|
9c853c5b9ebbb0ef60a013ae10ee411d70dfa832 |
|
18-Feb-2015 |
Piotr Jastrzebski <haaawk@google.com> |
Use OpenJdk implementations of java.text.* - LocaleInternalsTest has been disabled since it depends on internal implementation details. - Collator: Use libcore's RuleBasedCollatorICU to fetch collator rules instead of sun.misc.resources.LocaleData & friends. - DateFormat: Add support for set24HourTimePref (not wired up yet). - DateFormatSymbols : Use libcore's LocaleData & TimeZoneNames classes internally. - NumberFormat: Use libcore's LocaleData. - Drop support for SCIENTIFICSTYLE (we should re-enable this at some point ?). - SimpleDateFormat : Don't reject the format specifiers for standalone weekday and friends. We'll need to switch over to using ICU4J formatters at some point. - Calendar : Use GregorianCalendar only. - TimeZone : Use TimeZoneNames to access time zone names. Change-Id: I4a2866904d4f2f39f0793154d9aad7f109da3b5a
|
51b1b6997fd3f980076b8081f7f1165ccc2a4008 |
|
16-Feb-2015 |
Piotr Jastrzebski <haaawk@google.com> |
Initial import of OpenJdk files. Create new libcore/ojluni directory with src/main/java and src/main/native subdirectiories. Build ojluni into core-oj jar. Use openjdk classes from java.awt.font package. Copy all files from jdk/src/share/classes and jdk/src/solaris/classes directories in openjdk into libcore/ojluni/src/main/java. Copy following native files from openjdk to libcore/ojluni/src/main/native: jdk/src/solaris/native/java/io/canonicalize_md.c build/linux-amd64/include/classfile_constants.h jdk/src/share/native/java/net/DatagramPacket.c jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c jdk/src/share/native/java/lang/Double.c jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c jdk/src/solaris/native/java/io/FileDescriptor_md.c jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c jdk/src/share/native/java/io/FileInputStream.c jdk/src/solaris/native/sun/nio/ch/FileKey.c jdk/src/solaris/native/java/io/FileOutputStream_md.c jdk/src/solaris/native/java/io/FileSystem_md.c jdk/src/share/native/java/lang/Float.c jdk/src/share/native/java/net/Inet4Address.c jdk/src/solaris/native/java/net/Inet4AddressImpl.c jdk/src/share/native/java/net/Inet6Address.c jdk/src/solaris/native/java/net/Inet6AddressImpl.c jdk/src/share/native/java/net/InetAddress.c jdk/src/solaris/native/java/net/InetAddressImplFactory.c jdk/src/share/native/java/io/io_util.c jdk/src/solaris/native/sun/nio/ch/IOUtil.c jdk/src/share/native/java/io/io_util.h jdk/src/solaris/native/java/io/io_util_md.c jdk/src/solaris/native/java/io/io_util_md.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/java_io_FileDescriptor.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileInputStream.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileOutputStream.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileSystem.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_ObjectStreamClass.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_UnixFileSystem.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Double.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Float.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Integer.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Long.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Runtime.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Shutdown.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_StrictMath.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_String.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_System.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Thread.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Throwable.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_DatagramPacket.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4Address.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4AddressImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6Address.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6AddressImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddress.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddressImplFactory.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_NetworkInterface.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainDatagramSocketImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainSocketImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketInputStream.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOptions.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOutputStream.h jdk/src/share/native/java/lang/java_props.h jdk/src/solaris/native/java/lang/java_props_md.c jdk/src/share/native/java/util/zip/Adler32.c as java_util_zip_Adler32.c jdk/src/share/native/java/util/zip/CRC32.c as java_util_zip_CRC32.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_CRC32.h jdk/src/share/native/java/util/zip/Deflater.c as java_util_zip_Deflater.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Deflater.h jdk/src/share/native/java/util/zip/Inflater.c as java_util_zip_Inflater.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Inflater.h jdk/src/share/native/java/util/zip/ZipFile.c as java_util_zip_ZipFile.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_ZipFile.h jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h jdk/src/share/native/common/jlong.h jdk/src/solaris/native/common/jlong_md.h jdk/src/share/native/common/jni_util.c jdk/src/share/native/common/jni_util.h jdk/src/solaris/native/common/jni_util_md.c jdk/src/share/javavm/export/jvm.h jdk/src/solaris/javavm/export/jvm_md.h jdk/src/solaris/native/java/net/linux_close.c jdk/src/share/native/sun/misc/NativeSignalHandler.c jdk/src/solaris/native/sun/nio/ch/NativeThread.c jdk/src/share/native/java/net/net_util.c jdk/src/share/native/java/net/net_util.h jdk/src/solaris/native/java/net/net_util_md.c jdk/src/solaris/native/java/net/net_util_md.h jdk/src/solaris/native/java/net/NetworkInterface.c jdk/src/share/native/sun/nio/ch/nio.h jdk/src/solaris/native/sun/nio/ch/nio_util.h jdk/src/share/native/java/io/ObjectStreamClass.c jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c jdk/src/solaris/native/java/net/PlainSocketImpl.c jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c jdk/src/share/native/java/lang/Runtime.c jdk/src/share/native/java/lang/Shutdown.c jdk/src/share/native/sun/misc/Signal.c jdk/src/solaris/native/java/net/SocketInputStream.c jdk/src/solaris/native/java/net/SocketOutputStream.c jdk/src/share/native/java/lang/StrictMath.c jdk/src/share/native/java/lang/String.c build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_NativeSignalHandler.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_Signal.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/sun_net_spi_DefaultProxySelector.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileChannelImpl.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileDispatcherImpl.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileKey.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOStatus.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOUtil.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_NativeThread.h jdk/src/share/native/java/lang/System.c jdk/src/share/native/java/lang/Thread.c jdk/src/share/native/java/lang/Throwable.c jdk/src/solaris/native/java/io/UnixFileSystem_md.c jdk/src/solaris/native/java/lang/UNIXProcess_md.c jdk/src/share/native/java/util/zip/zip_util.c jdk/src/share/native/java/util/zip/zip_util.h Change-Id: Ib237df4e1b7b5b4d9f12e74d189e6ec9eed3c31d
|