summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5c6ea6f6: am c7743447: Merge "Enlarge the minimum key size of RSA to ↵Kenny Root2014-05-131-1/+1
|\ | | | | | | | | | | | | enhance the security" * commit '5c6ea6f61facd19fdcc2372b710fb8fb23905032': Enlarge the minimum key size of RSA to enhance the security
| * 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 c490e4dc: am 85cd6a19: Merge "Fix tests that relied on ReferenceQueue ↵Narayan Kamath2014-05-131-5/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ordering semantics." * commit 'c490e4dc33f0fe2086ec8d9cd872b9a358801eab': Fix tests that relied on ReferenceQueue ordering semantics.
| * | | 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 d8467fa1: am dd8a196a: Merge "Remove ArtMethod\'s quick fields for frame ↵Vladimir Marko2014-05-131-13/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | size and spills." * commit 'd8467fa1c1773e074ebff73bd11a0bf5538ae1d2': Remove ArtMethod's quick fields for frame size and spills.
| * | | | 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 424b079e: am c03fdbde: Merge "Fix ObjectInputStream proxy de-serialization"Neil Fuller2014-05-131-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '424b079e88ca4ffe52b250fad4d534ffb58302a6': Fix ObjectInputStream proxy de-serialization
| * | | | 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 0ed1f9fd: Fix mapping for Field.TIME_ZONE.Narayan Kamath2014-05-120-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ed1f9fd26b80f14ec4a5676c6f3fe00072c9bb5': Fix mapping for Field.TIME_ZONE.
| * | | | | | 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 (cherry picked from commit 78b660e21412ff36d3eed179ff400d8fa690267e) Change-Id: I72ff35b7d7fa079bbd08224c57fd065ac4eca038
* | | | | | | am 31b937ba: DO NOT MERGE : Suppress environment specific Console test in ↵Paul Duffin2014-05-121-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-test * commit '31b937ba8fcda6a34d7d587e251405b8e9252b6d': DO NOT MERGE : Suppress environment specific Console test in klp-modular-test
| * | | | | | DO NOT MERGE : Suppress environment specific Console test in klp-modular-testPaul Duffin2014-05-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test behaves differently in different environments. It works on a Nexus 7 device, breaks on host and molly so suppressing until we can fix it or have a better way of handling environment specific tests. Bug: 12491103 Change-Id: Id24e95e6f952b29bc56886ee7e6f6b4cb8d0477d
* | | | | | | am f586bda5: DO NOT MERGE : Suppress broken DecimalFormatTest on ↵Paul Duffin2014-05-121-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev for dory * commit 'f586bda5bf607c76b608b715ad248871522372f3': DO NOT MERGE : Suppress broken DecimalFormatTest on klp-modular-dev for dory
| * | | | | | DO NOT MERGE : Suppress broken DecimalFormatTest on klp-modular-dev for doryPaul Duffin2014-05-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DecimalFormatTest has some tests that appear to be broken. It is not clear without a much more detailed investigation as they appear to be issues with representation of very high precision numbers which is a complex area and very easy to get wrong. Will suppress the tests on klp-modular-dev so that it doesn't block progress on dory. Will investigate further and fix them properly on master. Bug: 12781028 Change-Id: Iff062b0cb2d7d55d7bc885b7f55bbaf48685d8f9
* | | | | | | Merge "resolved conflicts for merge of 55434452 to ↵Neil Fuller2014-05-120-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
| * \ \ \ \ \ \ resolved conflicts for merge of 55434452 to klp-modular-dev-plus-aospNeil Fuller2014-05-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: I6446ad90048100e6f87c2fe2203d98af85a31a44
| | * | | | | | Blacklist ControlTest test case.Neil Fuller2014-05-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | org.apache.harmony.tests.java.util.ControlTest The test is probably broken, but the code under test also looks broken. Unpicking it all and fixing it all is low priority. Marking it as known-broken until it can be given the attention it deserves. (cherry picked from commit d377f244c95a5bf24f0e8e2cd05ad27497f3e67f) Bug: 13747957 Conflicts: expectations/brokentests.txt Change-Id: I06cddf03846efbb9f8fee46b51ff94cac112e965
* | | | | | | | am cd8ce955: am 01a1441d: Merge "Fix mapping for Field.TIME_ZONE."Narayan Kamath2014-05-121-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'cd8ce9550bc059576e8012556f820578ed7e8cc2': Fix mapping for Field.TIME_ZONE.
| * | | | | | | 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 8d8da2f6: am 6cb4582b: Merge "Work around an icu4c 53 bug in ↵Elliott Hughes2014-05-121-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | DecimalFormat.getGroupingSize." * commit '8d8da2f68bd901a4c5de7b7b30448136162447b2': Work around an icu4c 53 bug in DecimalFormat.getGroupingSize.
| * | | | | | 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 28ae9615: am a2385153: Merge changes I726f16f9,Idd2f4ef1Lajos Molnar2014-05-124-77/+269
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28ae9615170bac91eb89fd3098d8c8b19bec759e': DirectByteBuffer: add setAccessible() Better protection against accessing freed DirectByteBuffers
| * | | | | | 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 da3e8346: DO NOT MERGE : Suppress test on klp-modular-devNeil Fuller2014-05-121-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit 'da3e83465c390f12ad7b7e89a914ae7bccbf4f0a': DO NOT MERGE : Suppress test on klp-modular-dev
| * | | | | | DO NOT MERGE : Suppress test on klp-modular-devNeil Fuller2014-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original bug: 13751920. The code under test is broken and will be fixed in aosp/master. In the meantime this looks like it has been broken for a long time. It is being suppressed on klp-modular-dev. Bug: 14674275 Change-Id: Ic6f1f448aa44a9a359a1c8bd8ab4d3f47ca1a546
* | | | | | | am 2b20f515: Fix Hashtable CTS testNeil Fuller2014-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2b20f515d5d2a3c31e8f4699dd52900beaced6e4': Fix Hashtable CTS test
| * | | | | | 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. Manual merge from aosp/master for klp-modular-dev. (cherry-pick of commit 4df29e1e1cf169ff6c77b8dd247de8c79b81d552 from aosp/master) Bug: 13747624 Change-Id: Ifc3acc0e70bad561f8d9aa443494b40ba0e37346
* | | | | | | am c1fa5983: am 52fb2230: Merge "Fix Hashtable CTS test"Neil Fuller2014-05-121-88/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c1fa59836cb9699e22b90eba7fa443e41ac9530e': Fix Hashtable CTS test
| * | | | | | 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
* | | | | | | am 50eab42c: More test suppression on klp-modular-dev. DO NOT MERGENeil Fuller2014-05-121-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '50eab42c88ac570e2175d1da37202330dedae76f': More test suppression on klp-modular-dev. DO NOT MERGE
| * | | | | | More test suppression on klp-modular-dev. DO NOT MERGENeil Fuller2014-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug for details. Bug: 14674275 Change-Id: Icf09ae470b9dfeb7239c6c1d4c717c0b555b4bd3
* | | | | | | am abca8498: Use the right class loader in ProxyTest.Narayan Kamath2014-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'abca8498091a4deb2aa564b1c564a55c980f15fd': Use the right class loader in ProxyTest.
| * | | | | | Use the right class loader in ProxyTest.Narayan Kamath2014-05-121-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the test classloader, and not the system classloader. bug: 12490858 (cherry picked from commit ed437fee3ddc5b25c2c724d4fc7c55ac0d207df1) Change-Id: I9539239252b0b71afa0e177ce11b3e64739a3ec9
generated by cgit v1.1 at 2025-03-18 19:44:33 +0000