summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | 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.
| * | | Merge "Fix the expected failure when an array of void is attempted to be ↵Ian Rogers2014-05-191-2/+2
| |\ \ \ | | |_|/ | |/| | | | | | 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 6167671b: Merge "Reenable tests that currently pass in CTS"Neil Fuller2014-05-192-91/+0
|\ \ \ | |/ / | | | | | | | | | * commit '6167671bf318661c6d9f9f44d4ad4b14d60e9224': Reenable tests that currently pass in CTS
| * | Merge "Reenable tests that currently pass in CTS"Neil Fuller2014-05-192-91/+0
| |\ \ | | |/ | |/|
| | * Reenable tests that currently pass in CTSNeil Fuller2014-05-192-91/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | The reasons I can do this are: 1) Fixes for other bugs / updates, etc. have made tests pass. 2) Bugs were fixed without removing suppressions. 3) Tests may have been suppressed by accident. Tested on a local device running a master build. Bug: 14808340 Change-Id: I7c6600c89ff1cc4ca5337ee952c972bdbf5467e8
* | am c58e40aa: Merge "Fix jsr166 tests"Calin Juravle2014-05-1617-73/+211
|\ \ | |/ | | | | | | * commit 'c58e40aa931b136cd54b6592bdba1d10592d8687': Fix jsr166 tests
| * Merge "Fix jsr166 tests"Calin Juravle2014-05-1617-73/+211
| |\
| | * Fix jsr166 testsCalin Juravle2014-05-1617-73/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests specified as static inner classes were failing because the CTS runner does not support them. The temporary fix is to promote all static inner test classes to top level classes. This should be reverted once the CTS runner is fixed. Bug: 13877168 Change-Id: Icb64d7d7fcf6202d54d6fe31d9e1c9a6a43a233b
* | | am b6e3df34: Merge "Remove unnecessary test suppression entries"Neil Fuller2014-05-163-717/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'b6e3df34d844a78f807582368faacbde69863869': Remove unnecessary test suppression entries
| * | Merge "Remove unnecessary test suppression entries"Neil Fuller2014-05-163-717/+4
| |\ \
| | * | Remove unnecessary test suppression entriesNeil Fuller2014-05-153-717/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most removals fit into these categories: 1) Test classes or methods that no longer exist / have been renamed 2) Various odd entries that are not for Junit tests. Some appear to correspond with some Open-JDK tests so may share a common heritage. Bug: 14808340 Change-Id: If829a83cfcf82cac9a0301733b724716087fea05
* | | 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 9c83373f: Merge "Removing suppression of tests that obviously no longer ↵Neil Fuller2014-05-153-270/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | exist." * commit '9c83373f193b1b951c5281ff47d06703c20e8817': Removing suppression of tests that obviously no longer exist.
| * | Merge "Removing suppression of tests that obviously no longer exist."Neil Fuller2014-05-153-270/+2
| |\ \
| | * | Removing suppression of tests that obviously no longer exist.Neil Fuller2014-05-153-270/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | This is a removal of tests from org.apache.harmony.luni.tests that no longer exist (under that package name). Bug: 14808340 Change-Id: I99e87fc43018596e4be0f4b352cc9a7cc33da4cc
* | | am c7743447: Merge "Enlarge the minimum key size of RSA to enhance the security"Kenny Root2014-05-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'c77434473d069d2e6a27b6d9fa008eeb05a3c1d5': Enlarge the minimum key size of RSA to enhance the security
| * | Merge "Enlarge the minimum key size of RSA to enhance the security"Kenny Root2014-05-131-1/+1
| |\ \
| | * | Enlarge the minimum key size of RSA to enhance the securityDanielMo2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have modified OpenSSL source code such that size of RSA key should be at least 512 bits or more to support higher quality key generation as lower key sizes are vulnerable to attack. Thus we need to increase the size to 512 to avoid CTS failures, please refer to it also. https://code.google.com/p/android/issues/detail?id=66394 Change-Id: I95d734033227ed1497a5bc0fd0010f62b12c01c5 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
* | | | am 85cd6a19: Merge "Fix tests that relied on ReferenceQueue ordering semantics."Narayan Kamath2014-05-131-5/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '85cd6a1913b894491efaad4bd50d7efe5021c69d': Fix tests that relied on ReferenceQueue ordering semantics.
| * | | Merge "Fix tests that relied on ReferenceQueue ordering semantics."Narayan Kamath2014-05-131-5/+6
| |\ \ \
| | * | | Fix tests that relied on ReferenceQueue ordering semantics.Narayan Kamath2014-05-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit eb3e5888d4b3 changed ReferenceQueue from LIFO to FIFO. Fix tests that were expecting it to be LIFO. Change-Id: I222513ddb091755fb27294939beb6565b661dd3d
* | | | | am dd8a196a: Merge "Remove ArtMethod\'s quick fields for frame size and spills."Vladimir Marko2014-05-131-13/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'dd8a196af3f25fa64d8c9deb325e0c44a9a8699a': Remove ArtMethod's quick fields for frame size and spills.
| * | | | Merge "Remove ArtMethod's quick fields for frame size and spills."Vladimir Marko2014-05-131-13/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove ArtMethod's quick fields for frame size and spills.Vladimir Marko2014-05-121-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a companion CL for art/ change "Move quick frame info to OatQuickMethodHeader." https://android-review.googlesource.com/93241 Change-Id: I07e2f4c756a0738433d9341847410b612001c5b6
* | | | | 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
| * | | | Merge changes I726f16f9,Idd2f4ef1Lajos Molnar2014-05-124-77/+269
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: 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 52fb2230: Merge "Fix Hashtable CTS test"Neil Fuller2014-05-121-88/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '52fb2230feb2726ab48704a0fd8d8c9c138db4d5': Fix Hashtable CTS test
| * | | | Merge "Fix Hashtable CTS test"Neil Fuller2014-05-121-88/+18
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix Hashtable CTS testNeil Fuller2014-05-121-88/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test assumed that the Enumeration returned from element() and keys() could be cast to Iterator. Even if it was previously ok, it isn't now and it is not part of the public API. Bug: 13747624 Change-Id: I552a886711178708cbe7b6d87a976b6c1a839467
generated by cgit v1.1 at 2025-01-10 23:07:53 +0000