summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
* am 7def6439: Merge "Improve ProcessManager."Elliott Hughes2013-05-082-340/+283
|\ | | | | | | | | * commit '7def64396da00e93a06e359497d6aaa781fe610f': Improve ProcessManager.
| * Merge "Improve ProcessManager."Elliott Hughes2013-05-072-340/+283
| |\
| | * Improve ProcessManager.Elliott Hughes2013-05-072-340/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd leave zombies around if chdir(2) or execvp(2) failed. We also used to unnecessarily make 32Ki close(2) calls for every child. This patch fixes both problems and makes the tests less meaningless. Bug: https://code.google.com/p/android/issues/detail?id=55017 Change-Id: I23ecc84aedd6650dbe6df19b4b0c2e6429578e50
* | | am a41da041: Merge "Make it clearer that a new MockWebServer is created for ↵Brian Carlstrom2013-05-061-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | each test run" * commit 'a41da0416f165216cacddff29d7e1359dcda0d7d': Make it clearer that a new MockWebServer is created for each test run
| * | Make it clearer that a new MockWebServer is created for each test runBrian Carlstrom2013-05-061-2/+2
| |/ | | | | | | Change-Id: Ib3ce11f42d19688fe00b7d057eece25567fccea2
* | am f7e1ba48: Merge "Various regex test fixes."Elliott Hughes2013-05-036-1418/+14
|\ \ | |/ | | | | | | * commit 'f7e1ba4804f7365e6ab47a34e019532b428b1546': Various regex test fixes.
| * Various regex test fixes.Elliott Hughes2013-05-036-1418/+14
| | | | | | | | | | | | | | Mostly test changes and some duplication removal, but I did turn up a couple of small bugs. Change-Id: I46f99cdf0cdb8a67d358c0acc03079360fe5c333
* | am 645c1562: Merge "Replace mentions of old JSSE package name"Kenny Root2013-05-032-2/+2
|\ \ | |/ | | | | | | * commit '645c15629a8abdb9f3a6e428ccb393eacd933552': Replace mentions of old JSSE package name
| * Replace mentions of old JSSE package nameKenny Root2013-05-032-2/+2
| | | | | | | | Change-Id: I7c90b08ee2b43c73e02512d0c6caaec098967e93
* | am e2aa9af9: Merge "Fix BufferedReader.readLine to not read ahead after \'\r\'."Elliott Hughes2013-05-022-80/+159
|\ \ | |/ | | | | | | * commit 'e2aa9af94aeeab0e245c3f423f90c76b8cbe0229': Fix BufferedReader.readLine to not read ahead after '\r'.
| * Merge "Fix BufferedReader.readLine to not read ahead after '\r'."Elliott Hughes2013-05-022-80/+159
| |\
| | * Fix BufferedReader.readLine to not read ahead after '\r'.Elliott Hughes2013-05-022-80/+159
| | | | | | | | | | | | | | | Bug: 8778372 Change-Id: I789d0ff5498cca48b16bb7b3b363014f7b6bcf95
* | | am e16c809d: Merge "Tracking changes to *-host for host shared libraries"Brian Carlstrom2013-05-021-22/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'e16c809d12fe57dc6521a5231368eaaabf66eb77': Tracking changes to *-host for host shared libraries
| * | Tracking changes to *-host for host shared librariesBrian Carlstrom2013-05-011-22/+0
| |/ | | | | | | Change-Id: I88dd48b09b9148246884a1c84b26787500c24569
* | am 2b2224dd: Merge "Fix ScopedStringChars to behave like ScopedUtfChars."Elliott Hughes2013-05-012-2/+0
|\ \ | |/ | | | | | | * commit '2b2224dd923153293fcfa165931a774520317b47': Fix ScopedStringChars to behave like ScopedUtfChars.
| * Fix ScopedStringChars to behave like ScopedUtfChars.Elliott Hughes2013-05-012-2/+0
| | | | | | | | | | | | | | Also reformat in Google C++ style and remove a couple of unnecessary #includes. Bug: https://code.google.com/p/android/issues/detail?id=45724 Change-Id: I6d1a78b3b1f72e7015baba64811d9749f330fba7
* | am ad86c68a: Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
|\ \ | |/ | | | | | | * commit 'ad86c68a7ee81bc2f1c42d3c33364b2c74132803': More ICU.getDateFormatOrder tests.
| * More ICU.getDateFormatOrder tests.Elliott Hughes2013-05-011-0/+4
| | | | | | | | | | Bug: 7207103 Change-Id: I93a09b67d26cb61626082516a05c4b9cdda642d2
* | am e2c689ab: Merge "Improve System.nanoTime documentation."Elliott Hughes2013-04-301-1/+1
|\ \ | |/ | | | | | | * commit 'e2c689ab581762cab6fdb70951b50458a30be1ee': Improve System.nanoTime documentation.
| * Merge "Improve System.nanoTime documentation."Elliott Hughes2013-05-011-1/+1
| |\
| | * Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
| | | | | | | | | | | | | | | Bug: 8733179 Change-Id: I12cf7fba00736ff1e9b2d8b2a1f5e50cf1070353
* | | am 9b040f6a: Merge "Add missing @Override annotations"Brian Carlstrom2013-04-301-5/+5
|\ \ \ | |/ / | | | | | | | | | * commit '9b040f6a4e6865ee72db707d27381d4886229eaa': Add missing @Override annotations
| * | Add missing @Override annotationsIan Rogers2013-04-301-5/+5
| |/ | | | | | | | | Change-Id: I4c5772c9549375beeb0e4f269bd61d623fca7e35 (cherry picked from commit 49992f5003aac55e1b1cf54769abc93630ccde93)
* | am 87b4b0f8: Merge "Implement getDateFormatOrder."Elliott Hughes2013-04-303-62/+141
|\ \ | |/ | | | | | | * commit '87b4b0f88fe0b5fa5c271593e483fb5bd306a6a4': Implement getDateFormatOrder.
| * Merge "Implement getDateFormatOrder."Elliott Hughes2013-04-303-62/+141
| |\
| | * Implement getDateFormatOrder.Elliott Hughes2013-04-303-62/+141
| | | | | | | | | | | | | | | | | | | | | | | | I do wonder if we shouldn't generalize this, rather than hard-code yMd, but YAGNI. Bug: 7207103 Change-Id: Ib59191eee97c08913f9a0a4ea52fb6eb8c677918
* | | am 0800e47a: Merge "Move JSSE to new package"Kenny Root2013-04-29137-38493/+15
|\ \ \ | |/ / | | | | | | | | | * commit '0800e47a2e19f185b7a62f1d26a74748db0cc047': Move JSSE to new package
| * | Merge "Move JSSE to new package"Kenny Root2013-04-30137-38489/+15
| |\ \ | | |/ | |/|
| | * Move JSSE to new packageKenny Root2013-04-29137-38489/+15
| | | | | | | | | | | | | | | | | | | | | | | | To help with shipping the JSSE with apps that want to bundle it, move it to a new package so that the tangles in other parts of the library can be untangled. Change-Id: I810b6861388635301e28aee5b9b47b8e6b35b430
* | | am 6cc37941: Merge "Fix various of the harmony nio tests."Elliott Hughes2013-04-291-3/+7
|\ \ \ | |/ / | | | | | | | | | * commit '6cc37941a936a9f054bdeed83b7ea3321c844182': Fix various of the harmony nio tests.
| * | Fix various of the harmony nio tests.Elliott Hughes2013-04-261-3/+7
| |/ | | | | | | | | | | | | Plus one real bug, in FileChannelImpl. The expectation I've removed was for a test that doesn't seem to exist in either our tests or the harmony tests. Change-Id: I1ea99042f3f8897f07ba8b4ad8e9a15f30ace79b
* | am ae662ed0: Merge "Fix ZoneInfoDBTest."Elliott Hughes2013-04-261-1/+1
|\ \ | |/ | | | | | | * commit 'ae662ed06a79610f18f973fe2a0e25ece2dfab52': Fix ZoneInfoDBTest.
| * Fix ZoneInfoDBTest.Elliott Hughes2013-04-261-1/+1
| | | | | | | | | | | | I'm so stupid. frameworks/base wasn't the only caller. Change-Id: Ia0c3ce79e2f899e77a9cd1e62fca7d3b22130cf2
* | am 06fe32ee: Merge "Remove the now-unused ZoneInfoDB.getVersion API."Elliott Hughes2013-04-261-4/+0
|\ \ | |/ | | | | | | * commit '06fe32ee348b1a1141df37a0efcf2c90bea7e1a2': Remove the now-unused ZoneInfoDB.getVersion API.
| * Merge "Remove the now-unused ZoneInfoDB.getVersion API."Elliott Hughes2013-04-261-4/+0
| |\
| | * Remove the now-unused ZoneInfoDB.getVersion API.Elliott Hughes2013-04-261-4/+0
| | | | | | | | | | | | Change-Id: I05aff6c07e9baca679b8b7759f4f0108067d06e6
* | | am bb57ca16: Merge "Add the harmony annotation tests."Elliott Hughes2013-04-264-181/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'bb57ca16b8b7577cbf0a03a1a5c9a7211b3f011d': Add the harmony annotation tests.
| * | Add the harmony annotation tests.Elliott Hughes2013-04-264-181/+0
| |/ | | | | | | Change-Id: Ibbca52bae20e24e2d76d038d85e1ff5411ffc523
* | am 783feda9: Merge "Fix vogar --mode device\'s fallback time zone."Elliott Hughes2013-04-261-1/+4
|\ \ | |/ | | | | | | * commit '783feda93e8645aaf4d5a3b9cbbcd5eeb88b29d8': Fix vogar --mode device's fallback time zone.
| * Fix vogar --mode device's fallback time zone.Elliott Hughes2013-04-261-1/+4
| | | | | | | | Change-Id: Icf7a5ecb5aa7e1b4e6effe26e7a4a63807d18b1c
* | am 971709da: Merge "Cope with a corrupt tzdata update."Elliott Hughes2013-04-265-145/+252
|\ \ | |/ | | | | | | * commit '971709da542bbaf163c89fce916fc943f0e1101a': Cope with a corrupt tzdata update.
| * Merge "Cope with a corrupt tzdata update."Elliott Hughes2013-04-265-145/+252
| |\
| | * Cope with a corrupt tzdata update.Elliott Hughes2013-04-265-145/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to fall back to the next choice on error. Rewrite the code to be testable and add some tests. Add an internal GMT-only fallback in case all our sources of tzdata are bad. Also make time zone detection on the host more useful. Bug: 8373554 Change-Id: I9f91b844a61f07f34b268535e6d24aa0c301bf8d
* | | am f73a8c28: Merge "Fix additional races in ↵Brian Carlstrom2013-04-262-23/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | org.apache.harmony.security.x509.Extensions" * commit 'f73a8c282e8e836871335fa75dcc7a06e914c975': Fix additional races in org.apache.harmony.security.x509.Extensions
| * | Fix additional races in org.apache.harmony.security.x509.ExtensionsBrian Carlstrom2013-04-252-23/+44
| | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/chromium/issues/detail?id=233610 Bug: 8712523 Change-Id: Ie54f62fa37f31e8ea37b5f4905f0ca3d3e22ac8f
* | | am 5ef7aa7f: Merge "TimerTest cleanup"Brian Carlstrom2013-04-251-339/+147
|\ \ \ | |/ / | | | | | | | | | * commit '5ef7aa7fbd7ae4a110c4c262de36a0feaa7e48d4': TimerTest cleanup
| * | TimerTest cleanupBrian Carlstrom2013-04-251-339/+147
| |/ | | | | | | | | Bug: 8657701 Change-Id: If3cb0892b63a1dff00ab33b92065ca54cc174123
| * Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.William Luh2013-04-253-5/+15
| | | | | | | | | | | | | | (cherry-pick of 7a302a49a7c8b99e2f34fff660e199fb7c776bc1.) Bug: 8617715 Change-Id: Ibfe919d67fd17cee050d23811faa5aa64116dfb4
* | am 2797d28f: Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-251-0/+1
|\ \ | |/ | | | | | | * commit '2797d28f58449627ad883543edd43f3edc45e9a3': Fix a bug in DatagramChannel.send.
| * Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-251-0/+1
| |\