summaryrefslogtreecommitdiffstats
path: root/luni/src
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 6186821c to dalvik-devJesse Wilson2011-02-0780-97/+84
|\
| * Move libcore.base classes to libcore.util and libcore.io.Jesse Wilson2011-02-0777-97/+77
* | am e5720bcc: Avoid name collision in libcore.base vs android.util.LruCache.Jesse Wilson2011-02-075-601/+266
|\ \ | |/
| * Avoid name collision in libcore.base vs android.util.LruCache.Jesse Wilson2011-02-075-601/+266
* | Merge "Avoid file locks in java.util.prefs." into dalvik-devJesse Wilson2011-02-072-60/+38
|\ \
| * | Avoid file locks in java.util.prefs.Jesse Wilson2011-02-072-60/+38
* | | Fix serialization of DecimalFormatSymbols.Elliott Hughes2011-02-0423-121/+143
* | | Fix a couple of tests.Elliott Hughes2011-02-041-4/+8
* | | Remove @Test cruft from all tests under luni/src/test/java/libcore.Elliott Hughes2011-02-0420-1481/+5
* | | Merge "Improve CharsetDecoder's quality of implementation, like CharsetEncode...Elliott Hughes2011-02-044-126/+93
|\ \ \
| * | | Improve CharsetDecoder's quality of implementation, like CharsetEncoder.Elliott Hughes2011-02-024-126/+93
| |/ /
* | | am adf31bd1: Merge "Permit cache elements to have non-symmetric sizes."Jesse Wilson2011-02-033-20/+194
|\ \ \ | |/ / |/| / | |/
| * Merge "Permit cache elements to have non-symmetric sizes."Jesse Wilson2011-02-033-20/+194
| |\
| | * Permit cache elements to have non-symmetric sizes.Jesse Wilson2011-02-033-20/+194
* | | Merge "Bring CharsetDecoderICU more in line with CharsetEncoderICU." into dal...Elliott Hughes2011-02-026-141/+41
|\ \ \
| * | | Bring CharsetDecoderICU more in line with CharsetEncoderICU.Elliott Hughes2011-02-026-141/+41
* | | | am 4155a249: Performance improvements to NativeCrypto based MessageDigest APIBrian Carlstrom2011-02-025-561/+415
|\ \ \ \ | | |/ / | |/| |
| * | | Performance improvements to NativeCrypto based MessageDigest APIBrian Carlstrom2011-02-015-561/+415
| | |/ | |/|
| * | Remove duplicate copy of test_SSLSocket_shutdownCloseOnClosedPeer from automergeBrian Carlstrom2011-01-301-44/+0
* | | Test that dalvikvm isn't vulnerable to a common double parsing bug.Jesse Wilson2011-02-021-0/+14
* | | Merge "Don't parse or format IP addresses in cert code." into dalvik-devJesse Wilson2011-02-013-181/+228
|\ \ \ | |_|/ |/| |
| * | Don't parse or format IP addresses in cert code.Jesse Wilson2011-02-013-181/+228
* | | Remove duplicate copy of the java.util.concurrent tests.Elliott Hughes2011-02-0155-31777/+0
* | | Merge "Improve CharsetEncoder to handle surrogates gracefully." into dalvik-devElliott Hughes2011-02-015-198/+97
|\ \ \ | |/ / |/| |
| * | Improve CharsetEncoder to handle surrogates gracefully.Elliott Hughes2011-01-315-198/+97
* | | Fix some tests to cope with new TestKeyStore exceptions.Jesse Wilson2011-01-312-16/+26
* | | Merge "Refactoring to add a builder for TestKeyStore." into dalvik-devJesse Wilson2011-01-315-74/+68
|\ \ \
| * | | Refactoring to add a builder for TestKeyStore.Jesse Wilson2011-01-315-74/+68
* | | | Merge "Don't do DNS lookups in URL.equals()" into dalvik-devJesse Wilson2011-01-314-104/+95
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't do DNS lookups in URL.equals()Jesse Wilson2011-01-314-104/+95
| |/ /
* | | Merge "Tidying of OutputStreamWriter and a couple of related tests." into dal...Elliott Hughes2011-01-313-59/+72
|\ \ \ | |/ / |/| |
| * | Tidying of OutputStreamWriter and a couple of related tests.Elliott Hughes2011-01-313-59/+72
* | | Remove duplicate copy of test_SSLSocket_shutdownCloseOnClosedPeer from automergeBrian Carlstrom2011-01-301-44/+0
* | | am 7aec72fe: am f4ee8646: am b2d079d5: am aa2be6b8: SSLSocket.close() should ...Brian Carlstrom2011-01-301-0/+44
|\ \ \ | | |/ | |/|
| * | am f4ee8646: am b2d079d5: am aa2be6b8: SSLSocket.close() should not throw an ...Brian Carlstrom2011-01-301-0/+44
| |\ \
| | * \ am b2d079d5: am aa2be6b8: SSLSocket.close() should not throw an IOException i...Brian Carlstrom2011-01-301-0/+44
| | |\ \
| | | * | SSLSocket.close() should not throw an IOException if there is a problem sendi...Brian Carlstrom2011-01-302-10/+49
| | | * | Merge from open-source gingerbreadJean-Baptiste Queru2011-01-144-8/+10
| | | |\ \
| | | | * | Address CTS test failures in libcore for gingerbread.Jesse Wilson2011-01-074-8/+10
* | | | | | am c906eaf2: am 7374d4fa: am 90ff8e2c: Remember intermediate CAs in TrustMang...Brian Carlstrom2011-01-302-53/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 7374d4fa: am 90ff8e2c: Remember intermediate CAs in TrustMangerImpl\'s Ind...Brian Carlstrom2011-01-302-53/+52
| |\ \ \ \ | | |/ / /
| | * | | Remember intermediate CAs in TrustMangerImpl's IndexedPKIXParametersBrian Carlstrom2011-01-302-53/+52
| | * | | Fix @see linksBrad Fitzpatrick2011-01-271-4/+4
| | * | | Fix libcore javadoc errors.Elliott Hughes2011-01-274-79/+26
* | | | | Merge "Fix OutputStreamWriter's handling of surrogates." into dalvik-devElliott Hughes2011-01-304-26/+244
|\ \ \ \ \
| * | | | | Fix OutputStreamWriter's handling of surrogates.Elliott Hughes2011-01-304-26/+244
* | | | | | Merge commit 'e2b2e81f' into manualmergeJesse Wilson2011-01-306-61/+474
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Use an LRU to cache reflection objects in Class.Jesse Wilson2011-01-306-64/+474
* | | | | Merge "Remove a useless layer of indirection." into dalvik-devElliott Hughes2011-01-281-60/+19
|\ \ \ \ \
| * | | | | Remove a useless layer of indirection.Elliott Hughes2011-01-281-60/+19