summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Deprecate use of BrokenTest and SideEffect"Neil Fuller2014-05-2113-31/+16
| |\ \
| | * | Deprecate use of BrokenTest and SideEffectBrett Chabot2014-05-2113-31/+16
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Use expectations files instead. (cherry picked from commit 6a6b612286976cc185c898803fe51e4e062bd9eb) Bug: 12924356 Change-Id: I9b7e71805a80176c873cffe46bed65f81de1903d
* | | am 8e34bfb3: Merge "Ensure NET_FAILURE_RETRY return -1 in case of an error"Neil Fuller2014-05-211-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '8e34bfb3d94388670de3d2be5bc575508d309e86': Ensure NET_FAILURE_RETRY return -1 in case of an error
| * | Merge "Ensure NET_FAILURE_RETRY return -1 in case of an error"Neil Fuller2014-05-211-0/+2
| |\ \
| | * | Ensure NET_FAILURE_RETRY return -1 in case of an errorSerguei Katkov2014-05-201-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | According to contract NET_FAILURE_RETRY / IO_FAILURE_RETRY should return -1 and set pending exception in case of an error. Not setting -1 was leading callers to assume a success. Change-Id: I995fa97f8ee8993a379f21582a14567818ea64bd Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
* | | am 96817bc3: Merge "Signature: remove unnecessary throw on clone"Kenny Root2014-05-202-17/+3
|\ \ \ | |/ / | | | | | | | | | * commit '96817bc38a0fb644b95dfb73a6fb5c273708b8f3': Signature: remove unnecessary throw on clone
| * | Signature: remove unnecessary throw on cloneKenny Root2014-05-202-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | If a class couldn't be cloned, it would throw its own exception. Instead, rely on the default implementation of "clone" to give a better error message when the target class isn't cloneable. Change-Id: I2cae9cdad9b4a7cf7fe50f7ad37fd22c1a97c825
* | | am f7a15ff4: Merge "MessageDigest: remove unnecessary throw on clone"Kenny Root2014-05-201-14/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'f7a15ff43004414e1eaa35872e9307383bdf84e4': MessageDigest: remove unnecessary throw on clone
| * | Merge "MessageDigest: remove unnecessary throw on clone"Kenny Root2014-05-201-14/+2
| |\ \
| | * | MessageDigest: remove unnecessary throw on cloneKenny Root2014-05-201-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a class couldn't be cloned, it would throw its own exception. Instead, rely on the default implementation of "clone" to give a better error message when the target class isn't cloneable. Change-Id: Id37013515d49cb69b5683a0632cfddb0fb325dc0
* | | | am a1ece7ec: Merge "Add regression tests for null arguments to DecimalFormat."Elliott Hughes2014-05-201-0/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a1ece7ecd8d1803dc568807ed677079716d6556d': Add regression tests for null arguments to DecimalFormat.
| * | | Merge "Add regression tests for null arguments to DecimalFormat."Elliott Hughes2014-05-201-0/+63
| |\ \ \
| | * | | Add regression tests for null arguments to DecimalFormat.Elliott Hughes2014-05-201-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was already fixed last year by 3909f6dba0812caee25a8779dcbf4c50ce9b19c7 under a different bug, but this extends the testing to all methods that could take a null argument. Bug: https://code.google.com/p/android/issues/detail?id=62269 Bug: 15081434 Change-Id: I30c97360a868e412649850109e24f2707c072a30
* | | | | am f315df1c: Merge "Fix OldURLClassLoaderTest#test_findResource_String"Neil Fuller2014-05-201-26/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f315df1cb0768bec10ada80d30d7069d15ac76ba': Fix OldURLClassLoaderTest#test_findResource_String
| * | | | Merge "Fix OldURLClassLoaderTest#test_findResource_String"Neil Fuller2014-05-201-26/+10
| |\ \ \ \
| | * | | | Fix OldURLClassLoaderTest#test_findResource_StringNeil Fuller2014-05-201-26/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test broke because Support_TestWebData was changed to provide the /test3 URL for a different test (Ib43e68a2536c2602b4c7ee0cda68fa1f90045f57). Changing the URL to test9999 fixes it. The OldURLClassLoaderTest is unpleasant but I haven't touched it beyond correcting the test and fixing some of the more obvious style / import problems that my IDE pointed out. Change-Id: I42b3e8ab69cdef65ee381efbf1988cfdfa359868
* | | | | am 34ea9861: Merge "Fix test_isWhitespace_against_icu4c"Neil Fuller2014-05-201-2/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '34ea986122cf6641d4d93500830524302621d15a': Fix test_isWhitespace_against_icu4c
| * | | | Merge "Fix test_isWhitespace_against_icu4c"Neil Fuller2014-05-201-2/+16
| |\ \ \ \
| | * | | | Fix test_isWhitespace_against_icu4cNeil Fuller2014-05-201-2/+16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICU4C and the RI disagree about one character. Add the special case to the test so it can pass. Also fix isSpaceChar_against_icu4c so it asserts something, and add the special case there too. Bug: 9690863 Change-Id: I389690e5c598b9e2f04015b0bc14799b163a6adf
* | | | | am 0e78f064: Merge "Fix InetAddressTest"Neil Fuller2014-05-201-3/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0e78f0642104c599abb9fd4fb24092a6afb25510': Fix InetAddressTest
| * | | | Merge "Fix InetAddressTest"Neil Fuller2014-05-201-3/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix InetAddressTestNeil Fuller2014-05-191-3/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: test_getByName test_isNumeric test_parseNumericAddress Change Ic42173b7b06e8536e8c4331087720d7df1e1681a (made in early 2011) modified handling of "obsolete" numeric IP addresses. At least since then, Octal addresses (those with leading 0's) have been parsed as decimal values. The tests were written to expect Octal values to be rejected and 0177.00.00.01 was expected to be treated as an invalid address. If interpreted as a decimal (177.0.0.1) it is fine. The tests have been updated to test a more obviously incorrect value and the docs have been updated to document how Android and the RI differ. Bug: 4539262 Change-Id: I5f9dce6b1accd81dda1348718fe0c74b03c27c29
* | | | am 6b9a7d3e: Merge "DirectByteBuffer: allow 0-size MappedByteBuffers ↵Lajos Molnar2014-05-192-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | starting at NULL" * commit '6b9a7d3e754ab5588aee4ae54579cf6838bb7e0c': DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULL
| * | | Merge "DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULL"Lajos Molnar2014-05-192-2/+5
| |\ \ \ | | |_|/ | |/| |
| | * | DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULLLajos Molnar2014-05-162-2/+5
| | |/ | | | | | | | | | | | | Bug: 14297827 Change-Id: I53ae796f9a59c70cc8250477ab51c57ea728e43b
* | | am 2de26a11: Merge "Fix the expected failure when an array of void is ↵Ian Rogers2014-05-191-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | attempted to be created." * commit '2de26a11390c644f5afda07f2a30a278e3a3543c': Fix the expected failure when an array of void is attempted to be created.
| * | Fix the expected failure when an array of void is attempted to be created.Ian Rogers2014-05-181-2/+2
| |/ | | | | | | | | | | NoClassDefFoundError is the RI behavior. Change-Id: Ia03b585def9f772aeb17f1cdec4da2d0c807ede3
* | am 76886eb3: Merge "Removing data hacks from ICU root.txt"Neil Fuller2014-05-158-60/+114
|\ \ | |/ | | | | | | * commit '76886eb39ac2e44075f0df90addae83933268722': Removing data hacks from ICU root.txt
| * Merge "Removing data hacks from ICU root.txt"Neil Fuller2014-05-158-60/+114
| |\
| | * Removing data hacks from ICU root.txtNeil Fuller2014-05-148-60/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the upstream ICU data was modified to support special short codes (e.g. PST, CET) so that they were recognized when parsing/formatting in all locales with SimpleDateFormat.parse()/format(). In an effort to more-closely replicate ICU this change does *not* introduce special casing for short / abbreviated names from Java APIs. This may have impact for applications that use Date.toString() (but not Date.parse()), SimpleDateFormat.parse(), SimpleDateFormat.format(), and anything that uses TimeZone methods that deal in formatting and zone strings (e.g. getZoneStrings(), getDisplayName()). Details: Date.parse() is unaffected because it handles abbreviated names only, is not internationalized and contains a set of recognized strings. Date.toString() is affected because it relies on SimpleDateFormat for formatting. ICU still supports abbreviated / short names for locales where those terms are considered unambiguous for residents of that locale. For example, "PST" is still parsed / formatted in Locale.US when using SimpleDateFormat. However, with this change "PST" will not be parsed/formatted other locales such as Locale.FRANCE, Locale.UK. If SimpleDateFormat.format() / TimeZone.getDisplayName() cannot find a short / abbreviated name for a timezone in the specified/defaulted locale, then a GMT offset is output as per the docs. Of particular note are methods that rely on Locale.getDefault() and/or Locale.getTimeZone(). Most user-facing usecases are expected to be unaffected. For example, US users will continue to see / enter PST. Applications that were previously parsing a date string containing (for example) PST but relying on the default locale will start seeing failures. Most of the changes are in tests that were hardcoding expected strings or relying on the default locale. This change is associated with a change in external/icu4c: I04acd15c62d49c0cf30cc63f60db320bdb8e22e9 This commit also includes minor test changes related to parsing/formatting dates where the default device locale is assumed to be US (or other English-speaking locale). Date-related tests that were relying on the default locale and broke when it was set to a non-English script are now explicitly setting it. Note: The tests all rely on the CtsTestRunner / Vogar resetting the default Locale / TimeZone between each test. Bug: 11413756 Change-Id: I9ae6397cf5335ef325aedb6472d0d66a6127e1dd
* | | am ab49c858: Merge "Fix decoding of jar: URLs"Neil Fuller2014-05-151-2/+18
|\ \ \ | |/ / | | | | | | | | | * commit 'ab49c8586b1c74e16bf1e7d16e0dee5c7814f8cd': Fix decoding of jar: URLs
| * | Merge "Fix decoding of jar: URLs"Neil Fuller2014-05-151-2/+18
| |\ \
| | * | Fix decoding of jar: URLsNeil Fuller2014-05-141-2/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the URL was not decoded. Therefore: new URL("jar:file:///my%20dir/file.jar!/").openConnection() would have expected to find a jar file "/my%20dir/file.jar" and not "/my dir/file.jar". libcore.net.url.FileURLConnection does work properly and does the same kind of decoding included here. This fixes: org.apache.harmony.tests.java.net.JarURLConnectionTest.test_getURLEncodedEntry Bug: 14811628 Change-Id: Ie1622bd3e9064c210f503bd54219b89e36aadc0e
* | | am 6b3592a7: Merge "Fix a test that assumes Locale.getDefault() == Locale.US"Neil Fuller2014-05-151-15/+14
|\ \ \ | |/ / | | | | | | | | | * commit '6b3592a745f9ab6339421d0eaa2f665ce207376d': Fix a test that assumes Locale.getDefault() == Locale.US
| * | Merge "Fix a test that assumes Locale.getDefault() == Locale.US"Neil Fuller2014-05-151-15/+14
| |\ \
| | * | Fix a test that assumes Locale.getDefault() == Locale.USNeil Fuller2014-05-141-15/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | If the device is set to non-English locale this fails. Setting the default locale explicitly makes the tests clearer (the CtsTestRunner / vogar) sets it back again. Change-Id: I4c197f4823115f178acc51a62a64855b790011b4
* | | am c03fdbde: Merge "Fix ObjectInputStream proxy de-serialization"Neil Fuller2014-05-131-3/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'c03fdbdeda2f1885039f51c7eb1527eac7078a2c': Fix ObjectInputStream proxy de-serialization
| * | Merge "Fix ObjectInputStream proxy de-serialization"Neil Fuller2014-05-131-3/+1
| |\ \
| | * | Fix ObjectInputStream proxy de-serializationNeil Fuller2014-05-131-3/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proxies were always being deserialized using the System classloader. In Android apps the System classloader is not correct: the app's classes (interfaces, etc.) are loaded by the app classloader. This was already a solved problem for normal classes so the fix is trivial. Bug: 13751920 Change-Id: Ia5accbbcb89e1b9bbafb27b5dbc0fc24650b0a1d
* | | am 01a1441d: Merge "Fix mapping for Field.TIME_ZONE."Narayan Kamath2014-05-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '01a1441df76f62e74c5a9ed76ff8feeff8dc454a': Fix mapping for Field.TIME_ZONE.
| * | Merge "Fix mapping for Field.TIME_ZONE."Narayan Kamath2014-05-121-1/+1
| |\ \
| | * | Fix mapping for Field.TIME_ZONE.Narayan Kamath2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts 018b61546e. Commit 018b61546e claims to fix a few failing tests, but the tests in question pass even without this section of this change. Commit 018b61546e also causes interoperability issues with the RI and causes DateFormatFieldTest to fail. More fundamentally, the mapping between Field.TIME_ZONE and Calendar.ZONE_OFFSET seems incorrect because the format classes manipulate Calendar#zone via setTimeZone and getTimeZone and do not directly modify the Calendar.ZONE_OFFSET / DST_OFFSET fields. bug: 12782114 Change-Id: Id3703a9f4e2ff3e3b24d4a45205722f72f440ba8
* | | | am 6cb4582b: Merge "Work around an icu4c 53 bug in ↵Elliott Hughes2014-05-121-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | DecimalFormat.getGroupingSize." * commit '6cb4582b0466e0fc1deff08c3d3a43b59b600703': Work around an icu4c 53 bug in DecimalFormat.getGroupingSize.
| * | | Merge "Work around an icu4c 53 bug in DecimalFormat.getGroupingSize."Elliott Hughes2014-05-121-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Work around an icu4c 53 bug in DecimalFormat.getGroupingSize.Elliott Hughes2014-05-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by org.apache.harmony.tests.java.text.DecimalFormatTest#test_getGroupingSize. Bug: http://bugs.icu-project.org/trac/ticket/10864 Change-Id: I7c9ad0dd468a2d1f7bdc3252c3de696786059a2b
* | | | am a2385153: Merge changes I726f16f9,Idd2f4ef1Lajos Molnar2014-05-124-77/+269
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'a238515382b28f73f82d2df362dee1d011689fd3': DirectByteBuffer: add setAccessible() Better protection against accessing freed DirectByteBuffers
| * | | DirectByteBuffer: add setAccessible()Lajos Molnar2014-05-124-45/+224
| | | | | | | | | | | | | | | | Bug: 14297827 Change-Id: I726f16f9a15f894b99a93c84aca820f5c1b994e5
| * | | Better protection against accessing freed DirectByteBuffersLajos Molnar2014-05-124-35/+48
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand preventing access of freed buffers, so duplicated ByteBuffers also become inaccessible when the original buffer is freed. Throw IllegalStateException in ByteBuffer.put(ByteBuffer) when either source or destination buffer is inaccessible. Bug: 11512044 Change-Id: Idd2f4ef1f3d66b4209441bf4014ccd4aad9d850b
* | | am 0a2ddb63: Merge "Remove test for unsupported GregorianCalendar ↵Narayan Kamath2014-05-121-9/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | functionality." * commit '0a2ddb63dcf5fa82131bc026f12c731ad85b2053': Remove test for unsupported GregorianCalendar functionality.
| * | Remove test for unsupported GregorianCalendar functionality.Narayan Kamath2014-05-121-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds an explanatory comment and makes the intent of the implementation clearer without changing any of the functionality. TL;DR - there doesn't appear to be any sensible way to provide any sort of consisent semantics if we plan on supporting these fields. bug: 12778197 Change-Id: Iadaaaa5d4bdddec4aceca498ffc870edf2cbefed
generated by cgit v1.1 at 2025-02-04 02:29:32 +0000