summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix unexpected EOF handling by KXmlParser.Vladimir Marko2013-06-282-5/+49
| | | | | | | | | | Avoid read position slipping beyond limit on EOF, causing an ArrayIndexOutOfBoundsException. Also fix two incorrect checks whether to read more data. Bug: 9012715 Change-Id: I40f60becd97eb4d9f33842bea2c19e9dc531d3b7
* Merge "Improve Scanner performance."Elliott Hughes2013-06-274-420/+6069
|\
| * Improve Scanner performance.Elliott Hughes2013-06-274-420/+6069
|/ | | | | | | | | | | | | | | | We really don't want to compute a new regular expression and compile it into a new Pattern every time we call nextInt (and friends). Adding a single-element cache (flushed if the Scanner's locale changes) makes this 100x faster. There still exists a pathological case where you switch back and forth between bases. Also improve the documentation to make it clearer that you really don't want to use this awful class anyway. Also bring back a few more of the tests we lost in the gingerbread timeframe. Bug: https://code.google.com/p/android/issues/detail?id=57050 Change-Id: Id6095682fb44abae2887dda29dd3d32ac777c68f
* Merge "Fix tests.api.java.lang.ProcessTest#test_getErrorStream."Elliott Hughes2013-06-271-1/+1
|\
| * Fix tests.api.java.lang.ProcessTest#test_getErrorStream.Elliott Hughes2013-06-271-1/+1
|/ | | | | | | | Our new getopt_long(3) distinguishes between illegal, invalid, unrecognized, ambiguous, and unknown options; the old one only had ambiguous and [two slight variants of] unknown. Change-Id: Iec4f124d66e4e483292043db5a93caa4cf1a15b0
* Merge "Fix SelectorTest#test_selectJ_Empty_Keys flakiness."Elliott Hughes2013-06-271-12/+14
|\
| * Fix SelectorTest#test_selectJ_Empty_Keys flakiness.Elliott Hughes2013-06-261-12/+14
| | | | | | | | Change-Id: I4acecd936075f226ae867d8b361ff422978af7de
* | Merge "NativeCrypto: Add ALPN support"Kenny Root2013-06-264-93/+307
|\ \ | |/ |/|
| * NativeCrypto: Add ALPN supportKenny Root2013-06-254-93/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to use Application-Layer Protocol Negotiation (ALPN) as both a client and a server. ALPN is essentially like Next Protocol Negotiation (NPN) but negotiation is done in the clear. This allows the use of other protocols on the same port (e.g., SPDY instead of HTTP on port 80). Although previously clients using NPN were able to use cut-through, the new ALPN API does not provide for a way for a client to enable that during a callback. So the only difference is that NPN clients can enable SSL False Start while ALPN clients cannot currently. Change-Id: I42ff70f3711e9cccaf754d189f76eeaa9db5f981
* | Merge "Clean up the #read javadoc."Elliott Hughes2013-06-2435-516/+208
|\ \ | |/ |/|
| * Clean up the #read javadoc.Elliott Hughes2013-06-2435-516/+208
|/ | | | | | | | By being more consistent in parameter naming, we can inherit more javadoc. Also fix a couple of javadoc warnings in KnownFailure and DataInputStream. Change-Id: I778f40469404fb50c51cdb1068970974f923180c
* Merge "Fix the SocketChannel accept locking behavior."Elliott Hughes2013-06-214-22/+27
|\
| * Fix the SocketChannel accept locking behavior.Elliott Hughes2013-06-214-22/+27
|/ | | | | | | Fixes a harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest test that had been failing since we turned it back on. Change-Id: I76cbc5edc1ab9edc4d2818bd23649f4b906d662c
* Merge "Fix non-blocking SocketChannel connects."Elliott Hughes2013-06-212-21/+73
|\
| * Fix non-blocking SocketChannel connects.Elliott Hughes2013-06-212-21/+73
|/ | | | | | | | | There are many reasons why the initial connect(2) may have resulted in a ConnectException, only one of which (EINPROGRESS) means we haven't yet failed. Bug: https://code.google.com/p/android/issues/detail?id=56684 Change-Id: I2115998bce9043f076418fb0d1c22a26e04ee2e1
* Merge "Revert "Use CLOCK_MONOTONIC_RAW for System.nanoTime.""Elliott Hughes2013-06-212-7/+2
|\
| * Revert "Use CLOCK_MONOTONIC_RAW for System.nanoTime."Elliott Hughes2013-06-212-7/+2
| | | | | | | | | | | | | | | | This reverts commit 7757924895a28a43ab9f7c3931cc9f972e870ddc. Further investigation suggests this is a worse clock for our purposes, not the better one it would appear to be from the man page. It looks more like it should have been called CLOCK_TSC. Change-Id: I6bf7fe4dac19272f145d240917129b4d5ab5ade1
* | Merge "Use CLOCK_MONOTONIC_RAW for System.nanoTime."Elliott Hughes2013-06-202-2/+7
|\ \ | |/
| * Use CLOCK_MONOTONIC_RAW for System.nanoTime.Elliott Hughes2013-06-202-2/+7
| | | | | | | | | | | | | | We still need to use CLOCK_MONOTONIC on Darwin. Bug: 9511688 Change-Id: Ieb1091e24ad5cd3bab79a4de1b1494cc64eef3d4
* | Merge "Sync java.util.concurrent library up to 12.06.2013."Elliott Hughes2013-06-2070-4159/+5444
|\ \ | |/ |/|
| * Sync java.util.concurrent library up to 12.06.2013.Calin Juravle2013-06-1470-4159/+5444
| | | | | | | | | | | | CouncurrentHashMap was skipped from this sync. Change-Id: I29c67698a2e706b22e3cb5920c5fe91f1f15461c
* | Merge "Add a short date format that's guaranteed to have 4-digit years."Elliott Hughes2013-06-171-0/+5
|\ \
| * | Add a short date format that's guaranteed to have 4-digit years.Elliott Hughes2013-06-171-0/+5
|/ / | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=56385 Change-Id: Ie60d8c61aae09358d296654bd30378cbd11eeecb
* | Merge "Fix CharBuffer.subSequence return type."Elliott Hughes2013-06-134-6/+4
|\ \
| * | Fix CharBuffer.subSequence return type.Elliott Hughes2013-05-164-6/+4
| | | | | | | | | | | | | | | Bug: 3484927 Change-Id: I06dae03b0803d1373e268e854e9e0e4b6c59e13a
* | | Merge "Fix URLConnectionTest after latest okhttp update."Narayan Kamath2013-06-131-2/+2
|\ \ \
| * | | Fix URLConnectionTest after latest okhttp update.Narayan Kamath2013-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I've observed 14 failing tests both before and after the update. Change-Id: I40dfd9efe35ed03d89b38b030d3c7b6558b247e2
* | | | Merge "Offer default implementations of various dalvik intrinsics in the ↵Brian Carlstrom2013-06-087-12/+169
|\ \ \ \ | | | | | | | | | | | | | | | library."
| * | | | Offer default implementations of various dalvik intrinsics in the library.Elliott Hughes2013-06-077-12/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-picked from commit 2f95766aac3df74c6c641232eec4791b2330c9df) Change-Id: I1005ee22ed8a017bb536bfd76df2173c7e8dcf64
* | | | | Merge "Fix memory leaks in org_apache_harmony_xml_ExpatParser"Elliott Hughes2013-06-071-0/+3
|\ \ \ \ \
| * | | | | Fix memory leaks in org_apache_harmony_xml_ExpatParserMikael Gullstrand2013-06-071-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method expandInternedStringBucket(...) creates a new bucket but the old bucket is never freed, even though the function doc claims that it does. To solve this problem the old bucket is freed when the new one has been created successfully. Also this commit fixes two possible memory leaks when a jniThrowOutOfMemoryError is thrown, where the internedString also needs to be freed. Change-Id: Ic80a35a2b4ec8f93ddc006aca5609a5ffe74d659
* | | | | Merge "Improve String.toCharArray documentation."Elliott Hughes2013-06-071-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve String.toCharArray documentation.Elliott Hughes2013-06-071-3/+3
|/ / / / | | | | | | | | | | | | Change-Id: Ie210fed0b59cfd009a969dfbfab06b858e06c463
* | | | Merge "Move System.currentTimeMillis, nanoTime, and mapLibraryName into the ↵Brian Carlstrom2013-06-072-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | library."
| * | | | Move System.currentTimeMillis, nanoTime, and mapLibraryName into the library.Elliott Hughes2013-06-072-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-picked from commit 37d6cc06f62b2029663137a1b8c18242152c1e97) Change-Id: I3b3aa3f508b9c6f43b27022cd8bc9aa82e630e01
* | | | | Merge "Fix zone.tab parsing."Elliott Hughes2013-06-072-0/+15
|\ \ \ \ \
| * | | | | Fix zone.tab parsing.Elliott Hughes2013-06-072-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not every zone.tab line has a comment. Bug: 9327819 Change-Id: I32811c2da34755e2a15334f8701523505e1398b3
* | | | | | Merge "Move dalvik.system.VMDebug to libdvm"Brian Carlstrom2013-06-071-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Move dalvik.system.VMDebug to libdvmBrian Carlstrom2013-06-071-0/+0
|/ / / / | | | | | | | | | | | | Change-Id: I7b218f9732b36b9cca5ebc38380f3e7ef0275f34
* | | | Merge "Add a test for bug 9087737."Elliott Hughes2013-06-061-0/+8
|\ \ \ \
| * | | | Add a test for bug 9087737.Elliott Hughes2013-06-061-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't crash unless you're very unlucky, but at least valgrind will notice something untoward is going on. Bug: 9087737 Change-Id: I486374a85d4f0cc3a0e7afec29a1003ce1951a5a
* | | | Merge "Fix @deprecated javadoc orthography."Elliott Hughes2013-06-0642-111/+101
|\ \ \ \
| * | | | Fix @deprecated javadoc orthography.Elliott Hughes2013-06-0642-111/+101
| | | | | | | | | | | | | | | | | | | | Change-Id: I6db6d91e21b8e1aca5b5338534196fd5bdef8a06
* | | | | Merge "Fix bug in DNParser change"Brian Carlstrom2013-06-061-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bug in DNParser changeBrian Carlstrom2013-06-061-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure emailAddress encoded as IA5String Bug: http://code.google.com/p/android/issues/detail?id=21531 Bug: 5580664 Change-Id: I19b432bc84468828258cbcd44266e4b712e6175d Bug: 9198822 Change-Id: I8a29f160e870f8deb4b8f3787bb69b4971942c5d
* | | | Merge "Add ReflectiveOperationException."Elliott Hughes2013-06-067-6/+59
|\ \ \ \ | |_|/ / |/| | |
| * | | Add ReflectiveOperationException.Elliott Hughes2013-06-057-6/+59
| | | | | | | | | | | | | | | | | | | | Bug: 3484927 Change-Id: I6ef7b71aba70bab7664ea29ef73ba8a542550e27
* | | | Merge "Moving java.lang.String to libdvm"Brian Carlstrom2013-06-061-0/+0
|\ \ \ \
| * | | | Moving java.lang.String to libdvmBrian Carlstrom2013-06-051-0/+0
| |/ / / | | | | | | | | | | | | Change-Id: Ia03630612b6d4e116b9c737cdf7a93c8eacee910
* | | | Merge "NativeCrypto: handle X.509 serial number 0"Kenny Root2013-06-051-3/+2
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.1 at 2025-01-10 08:40:01 +0000