summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-devElliott Hughes2013-04-301-0/+8
| | | | | | | DexBuffer became Dex, and moved to libcore. Change-Id: I32447f83c03dd18f2339e879d015134be9f4fc18 (cherry picked from commit 621d004d61b3eaca74fc045a3fba6afa14327a2e)
* Manually merge "Compact merged dexes on their byte aligned size"Jesse Wilson2013-04-301-0/+9
| | | | | | | | | The changed file was moved from dalvik/ to libcore/ in this branch. See https://android-review.googlesource.com/34010 Change-Id: I9b2fae8767fb4e7461e9b762e70efb4171e7a9f5 (cherry picked from commit 20d13d20f6b8d4094d4d66bb692ac19c4b81348f)
* Add missing @Override annotationsIan Rogers2013-04-302-6/+6
| | | | | Change-Id: I4c5772c9549375beeb0e4f269bd61d623fca7e35 (cherry picked from commit 49992f5003aac55e1b1cf54769abc93630ccde93)
* Merge "Fix DexMerger to emit dex files without extended op codes."Brian Carlstrom2013-04-301-2/+2
|\
| * Fix DexMerger to emit dex files without extended op codes.Jesse Wilson2013-04-301-2/+2
| | | | | | | | | | | | | | | | | | Certain tools in our tool chain don't like these. Patched from master/dalvik change: Iaaff85c1b634f647d0105c36f403b2e03aaf0ca7 Change-Id: I7b5c6bf2b6a6ed96c9bb76817154344764e61c62 (cherry picked from commit 463cf8e67948d7d82a31c74588903b70fdd6b7b0)
* | Merge "Make Dex access faster by making binarySearch work."Brian Carlstrom2013-04-301-6/+11
|\ \ | |/
| * Make Dex access faster by making binarySearch work.Jesse Wilson2013-04-301-6/+11
| | | | | | | | | | Change-Id: I5f506ef2cd73c2f88f395ad1e1200d79ed33f654 (cherry picked from commit 8cf91498080408179f1b96ae832b581b8547d7c4)
* | Merge "Remove redundant alignToFourBytes in favor of ↵Brian Carlstrom2013-04-301-6/+9
|\ \ | |/ | | | | alignToFourBytesWithZeroFill"
| * Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFillBrian Carlstrom2013-04-301-6/+9
| | | | | | | | | | | | (cherry picked from commit d2301a66b2629f2841ab3a3cc7684a645ebe7217) Change-Id: I32522d86950d0c1a89e77b44ddeab071ce9c021a
* | Merge "Improve exception detail message"Brian Carlstrom2013-04-301-2/+2
|\ \ | |/
| * Improve exception detail messageBrian Carlstrom2013-04-301-2/+2
| | | | | | | | | | | | (cherry picked from commit 345a87a2e40955ad999e56cbd3674ccc95e16537) Change-Id: I4ecb9d07bd3bf50cdcfe67c21a53181dfcbc670b
* | Merge "Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic"Brian Carlstrom2013-04-301-17/+19
|\ \ | |/
| * Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magicBrian Carlstrom2013-04-301-17/+19
|/ | | | | | (cherry picked from commit 34c119762d55411ec2451b38f4782b923217aa2c) Change-Id: I968762e1962fb720bbcf0c2866f17cd0500a9e54
* Merge "Switch Dex from byte[] to ByteBuffer for backing store."Brian Carlstrom2013-04-301-93/+157
|\
| * Switch Dex from byte[] to ByteBuffer for backing store.Jesse Wilson2013-04-301-93/+157
| | | | | | | | | | | | | | | | | | | | | | | | The ByteBuffer allows Dex to share the mapped data with Class.getDex(). This also changes Dex.Section to use a ByteBuffer; that ByteBuffer's position and limit are used instead of a separate pair of integers. Change-Id: I2b8042a493f70213c30e5c26e0bacfb03daebf55 (cherry picked from commit 59653899ed7cbca17f5a3dd32a23e81b3c4a5339)
* | Merge "Add Dex.create(ByteBuffer)"Brian Carlstrom2013-04-301-0/+26
|\ \ | |/
| * Add Dex.create(ByteBuffer)Brian Carlstrom2013-04-301-0/+26
| | | | | | | | | | | | (cherry picked from commit aca7a4ba7597be831164d94d787f383b8d4ac2fd) Change-Id: Id517f2ccda31a20e28fe63005120e4e975935980
* | Merge "Move dex utilities from dalvik/dx to libcore/dex part 2"Brian Carlstrom2013-04-3026-1/+3058
|\ \ | |/
| * Move dex utilities from dalvik/dx to libcore/dex part 2Jesse Wilson2013-04-3026-1/+3058
|/ | | | | Change-Id: Ib5bb7bec80d77464f632f1cdfef708d868301c42 (cherry picked from commit 9ae95d8f3381204108abc722e8e5a03d6ecbf311)
* 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
* | Merge "Move JSSE to new package"Kenny Root2013-04-30143-340/+493
|\ \ | |/ |/|
| * Move JSSE to new packageKenny Root2013-04-29143-340/+493
| | | | | | | | | | | | | | | | 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
* | Merge "Fix various of the harmony nio tests."Elliott Hughes2013-04-295-31/+49
|\ \ | |/ |/|
| * Fix various of the harmony nio tests.Elliott Hughes2013-04-265-31/+49
|/ | | | | | | 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
* Merge "Add the harmony nio tests."Elliott Hughes2013-04-26102-0/+23248
|\
| * Add the harmony nio tests.Elliott Hughes2013-04-26102-0/+23248
|/ | | | Change-Id: I8a6d167743b20f31e769fe57d3aba89e16de24c3
* Merge "Fix ZoneInfoDBTest."Elliott Hughes2013-04-261-1/+1
|\
| * Fix ZoneInfoDBTest.Elliott Hughes2013-04-261-1/+1
|/ | | | | | I'm so stupid. frameworks/base wasn't the only caller. Change-Id: Ia0c3ce79e2f899e77a9cd1e62fca7d3b22130cf2
* 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
* | Merge "Add the harmony annotation tests."Elliott Hughes2013-04-265-7/+111
|\ \ | |/ |/|
| * Add the harmony annotation tests.Elliott Hughes2013-04-265-7/+111
|/ | | | Change-Id: Ibbca52bae20e24e2d76d038d85e1ff5411ffc523
* Merge "Fix vogar --mode device's fallback time zone."Elliott Hughes2013-04-261-1/+4
|\
| * Fix vogar --mode device's fallback time zone.Elliott Hughes2013-04-261-1/+4
|/ | | | Change-Id: Icf7a5ecb5aa7e1b4e6effe26e7a4a63807d18b1c
* 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
* | Merge "Fix additional races in org.apache.harmony.security.x509.Extensions"Brian Carlstrom2013-04-262-23/+44
|\ \
| * | 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
* | Merge "TimerTest cleanup"Brian Carlstrom2013-04-251-339/+147
|\ \ | |/ |/|
| * TimerTest cleanupBrian Carlstrom2013-04-251-339/+147
|/ | | | | Bug: 8657701 Change-Id: If3cb0892b63a1dff00ab33b92065ca54cc174123
* Merge "Only enforce the encrypted bit in the GPBF, and ignore other ↵Elliott Hughes2013-04-253-5/+15
|\ | | | | | | unsupported bits."
| * 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
* Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-253-0/+2639
|\
| * Fix a bug in DatagramChannel.send.Elliott Hughes2013-04-243-0/+2639
| | | | | | | | | | | | | | | | | | Calling sendto(2) binds your socket as a side-effect, but we'd still report false from isBound. Also bring in the harmony tests that would have caught this earlier. Change-Id: I26baa15c8178edab9136a37742faddd11f381c7b
* | Merge "Do not set valueDecoded until after the value is decoded"Brian Carlstrom2013-04-251-2/+2
|\ \ | |/ |/|
| * Do not set valueDecoded until after the value is decodedBrian Carlstrom2013-04-241-2/+2
| | | | | | | | | | | | Bug: https://code.google.com/p/chromium/issues/detail?id=233610 Bug: 8712523 Change-Id: I976df514e761ffe0d1be1ca8b18e9fe5050c2ba7
* | Merge "Fix getLocalAddress on closed sockets."Elliott Hughes2013-04-256-38/+40
|\ \
| * | Fix getLocalAddress on closed sockets.Elliott Hughes2013-04-246-38/+40
|/ / | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=54072 Change-Id: Ie32708054f584885ec85dd7847c128d48ff6c7d5
* | Merge "Reads from /dev/urandom can't really block."Elliott Hughes2013-04-247-89/+514
|\ \
generated by cgit v1.1 at 2025-03-14 20:26:17 +0000