summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Suppress broken apache-harmony beans CTS tests"Neil Fuller2014-09-091-0/+17
|\ \ \ | |/ / |/| |
| * | Suppress broken apache-harmony beans CTS testsNeil Fuller2014-09-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the apache-harmony serialization tests is package-sensitive. The other tests suppressed probably broke due to a fix in the Android fork of harmony (commit 19a270e90b1e992c1f6639f355ae13564c2f3a6a). The code may be incorrect but if so it has been broken subtly since Dec 2010. Bug 17433734 has been created to investigate. Bug: 17394106 Change-Id: I654d82b607e5487e0e6614ec4bcc5be98a9394e9
* | | Merge "Add handling for hashed uninflated object."Mathieu Chartier2014-09-091-0/+6
|\ \ \ | |/ / |/| |
| * | Add handling for hashed uninflated object.Mathieu Chartier2014-09-081-0/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an Optimization to reduce how often we call System.identityHashCode. If the lockword is set to the hash code state then we simply return this value. Otherwise, we use System.identityHashCode. Maps launch exclusive time spent in System.identityHashCode: Before: 4.5% After: 2.4% Bug: 16828525 (cherry picked from commit 6917aebf2eb26c2b003a72d09c1c5bb6310160b0) Change-Id: I0ccad53cb5f8f4f27fe11725a91ab45a117452a3
* | Merge "Change ReferenceQueue.add to append at end of the unenqueued list"Mathieu Chartier2014-09-051-3/+12
|\ \
| * | Change ReferenceQueue.add to append at end of the unenqueued listMathieu Chartier2014-09-051-3/+12
|/ / | | | | | | | | | | | | | | | | We now append the singly linked list at the end of the queue. Previously the list was added after the first element of the unenqueued list. Bug: 17381967 Change-Id: I6d4eb1053e5a2babd559e410b42344a04490e7b5
* | Merge "DecimalFormatSymbols with a null locale should throw."Narayan Kamath2014-09-051-0/+4
|\ \
| * | DecimalFormatSymbols with a null locale should throw.Narayan Kamath2014-09-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We left this out when manually auditing the list of classes that don't throw and silently use the default (like Calendar) vs those that do. See bugs 16938922 and 15849709. bug: 17394277 Change-Id: I6e1dae3c9251dfd48221914351a504f24f4bdf5d
* | | Merge "Make sure calendars are compared correctly."Narayan Kamath2014-09-051-3/+11
|\ \ \ | |/ / |/| |
| * | Make sure calendars are compared correctly.Narayan Kamath2014-09-051-3/+11
|/ / | | | | | | | | | | | | | | | | | | The calendars will use System.currentTimeMillis if we don't explicitly call setTimeMillis or setTime. We don't particularly care about time here, we just need to check that all Locale derived fields are equal. bug: 17377252 Change-Id: Ibd5e74c237e5520580f1f44b4e98b021000639fa
* | Merge "Fix race in finalizeAllEnqueued."Mathieu Chartier2014-09-041-1/+7
|\ \
| * | Fix race in finalizeAllEnqueued.Mathieu Chartier2014-09-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was as follows: The GC finishes and enqueues all cleared references on the ReferenceQueue.unenqueued list. Then someone calls finalizeAllEnqueued which enqueues a finalizer reference directly on the finalizer reference queue. However the recently cleared references had not yet been processed by the ReferenceQueueDaemon resulting in the sentinal being finalized before the objects which were freed in the GC. The fix is enqueuing the sentinel finalizer reference on the unenqueued queue. (cherry picked from commit 2cc3d41ff2dfd673fa1ab4ef2a46525933d523ec) Change-Id: I0598199ef56aa8bd9e1fa40c39d50b2785dc5c10
* | | Merge "Libcore: Add parameter to zygote hook"Andreas Gampe2014-09-041-4/+6
|\ \ \ | |/ / |/| |
| * | Libcore: Add parameter to zygote hookAndreas Gampe2014-09-031-4/+6
| |/ | | | | | | | | | | Add a parameter to be passed to ART. Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
* | Merge "Fix apache-harmony logging tests"Neil Fuller2014-09-044-27/+67
|\ \
| * | Fix apache-harmony logging testsNeil Fuller2014-09-044-27/+67
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed SocketHandler to re-introduce a "socket != 0" check unintentionally removed by commit 232c91dce1760b180155256d1896d0d80375ff6d. Some failures are the result of the test code being newer than the libcore code. Android took its last libcore update from apache-harmony some time after r820767 but before r929953 and its test-code update at r1097236. This explains a few things. Updated FileHandler to deal with null system properties. This is an equivalent change to http://svn.apache.org/viewvc?view=revision&revision=935099 Updated XMLFormatter to handle basic XML escaping. This is an equivalent change to http://svn.apache.org/viewvc?view=revision&revision=929953 Unsuppress tests that are fixed by this. Bug: 13882147 Change-Id: I36321b488da6d4e08fbb0d28d0e366f9b06e6371
* | Merge "Rearrange a few of our MIME type registrations."Narayan Kamath2014-09-042-6/+13
|\ \
| * | Rearrange a few of our MIME type registrations.Elliott Hughes2014-09-042-6/+13
|/ / | | | | | | | | | | | | | | | | | | Based on looking at IANA and wikipedia. Bug: 16978217 (cherry picked from commit 93235f904ce83fe138c90a90c66d0e78f9f405b8) Change-Id: I272436facd3c2f5dbc8c455fc340293b83f98453
* | Merge "Fix SDK and docs build."Neil Fuller2014-09-042-13/+13
|\ \
| * | Fix SDK and docs build.Eino-Ville Talvala2014-09-042-13/+13
| |/ | | | | | | | | | | | | | | Replace {@link} references to hidden methods with {@code}. (cherry picked from commit f73b1089c7236a7268ccce10546cc340a36f8c4b) Change-Id: Iff245542979c2bbcea8b6c4b4632547c6aac4da4
* | Merge "Keep qtaguid quiet by not trying to untag non-sockets."Elliott Hughes2014-09-035-4/+51
|\ \ | |/ |/|
| * Keep qtaguid quiet by not trying to untag non-sockets.Elliott Hughes2014-09-035-4/+51
|/ | | | | | | (cherry-pick of f6cf9efb212e572dcd2e902ca461af6323793dbf.) Bug: 17203955 Change-Id: I0999fc0ff295986b92e31568d96e321b9e7ffb2c
* Merge "Suppress broken apache-harmony logging CTS tests"Neil Fuller2014-09-021-0/+49
|\
| * Suppress broken apache-harmony logging CTS testsNeil Fuller2014-09-021-0/+49
|/ | | | | | | | | | | | | | | | | Add test suppression entries for differences known to be caused by Android changes and failures that involve java code fixes. Some failures are the result of the test code being newer than the libcore code. Android took its last libcore update from apache-harmony some time after r820767 but before r929953 and its test-code update at r1097236. This explains a few things. java package fixes will be applied via a separate commit. Bug: 13882147 Change-Id: Ie5f3d1e5bb80a6aa8e3341a3bceacc65a58b2ca3
* Merge "Suppressing broken java.sql apache harmony tests."Neil Fuller2014-09-011-0/+31
|\
| * Suppressing broken java.sql apache harmony tests.Neil Fuller2014-09-011-0/+31
|/ | | | | | | | | | | | | | These are long-standing failures that we don't intend to fix in the foreseeable future. Developers have been encouraged to use android classes for database access. Bug: 17342415 Bug: 17321262 Bug: 17320961 Bug: 17093235 Change-Id: I30ed5576471253f58a63162347966dc11056cb31
* Merge "Make explicit that ISA names are used in some sys properties"Calin Juravle2014-08-271-0/+4
|\
| * Make explicit that ISA names are used in some sys propertiesCalin Juravle2014-08-261-0/+4
|/ | | | Change-Id: I0620c33972e061ba18504579430d2ac02656d17a
* Merge "Fix the Turkish Lira test."Elliott Hughes2014-08-231-5/+7
|\
| * Fix the Turkish Lira test.Elliott Hughes2014-08-221-5/+7
|/ | | | | | | | | | Turkey switched from "123,45 TL" to "₺123,45" in 2012. It's taken a while for our font to catch up, but now it has. (cherry-pick of c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.) Bug: 16727554 Change-Id: I3c80f95d5f620c905247c9f227171717180106b4
* Merge "Work around the snappily-titled ICANN "Name Collision Occurrence ↵Elliott Hughes2014-08-232-4/+4
|\ | | | | | | Management Framework"."
| * Work around the snappily-titled ICANN "Name Collision Occurrence Management ↵Elliott Hughes2014-08-222-4/+4
|/ | | | | | | | | | | Framework". Using a non-existent TLD is now a Bad Idea. (cherry-pick of a7d651e95e38974fa0de19247e8341df98a0b1b1.) Bug: 17146413 Change-Id: I6a68b4609d59a6d56ba780d03ffcf24a2759db48
* Merge "Avoid wrapping Class in WeakReference when class loader is null."Ian Rogers2014-08-221-7/+1
|\
| * Avoid wrapping Class in WeakReference when class loader is null.Ian Rogers2014-08-221-7/+1
| | | | | | | | | | | | Fix a missing case from one constructor by delegating to another. Change-Id: I8b85c97586dde2d72c9ac21216c594aa810d761b
* | Merge "Support narrow am/pm markers in LocaleData."Elliott Hughes2014-08-223-2/+44
|\ \
| * | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-223-2/+44
|/ / | | | | | | | | | | | | (cherry-pick of ebe417d7808ac5bce5bc14d36d6af4c31218326d.) Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881
* | Merge "Move preference tests over from external/apache-harmony."Narayan Kamath2014-08-2217-0/+3228
|\ \ | |/ |/|
| * Move preference tests over from external/apache-harmony.Narayan Kamath2014-08-2217-0/+3228
|/ | | | | | | | | | | | | | Also fixes all remaining failures. Most of them were due to us not setting "user.dir" and "user.home" correctly. Android has traditionally left those values blank. To fix these tests, we need to change the default prefs factory to one rooted at a temporary directory. Note that this change attempts the minimal possible cleanup (mainly style, commented code formatting etc.) to these files. bug: 13881847 Change-Id: I1918ee9af07be9612a7da142b3e584aabc860085
* Merge "Fix abuse of Runtime.freeMemory."Narayan Kamath2014-08-221-41/+37
|\
| * Fix abuse of Runtime.freeMemory.Narayan Kamath2014-08-211-41/+37
|/ | | | | | | | | | Runtime.freeMemory is the largest allocation that's possible *without a heap expansion*. That's a poor proxy for "can i allocate this byte array" and leads to flaky CTS tests. bug: 17021619 Change-Id: I108138bf2402e899a40a0b3081c083f733e7c999
* Merge "Fix init test cases from DexClassLoaderTest."Calin Juravle2014-08-211-32/+52
|\
| * Fix init test cases from DexClassLoaderTest.Calin Juravle2014-08-211-32/+52
|/ | | | | | | | | | | | | Because the tests cases are executed in the same runtime and the class linker may cache generated optimized files, init tests need to use their own optimized directories (so that they can reliable test the number of generated files). Bug: 16806146 (cherry picked from commit 58c130c1eb99cc72998150d813b3e31896e3bfaf) Change-Id: I8111cc7ea640f3bc94821fcd4380acfc078c746f
* Merge "bionic has always had gettid."Elliott Hughes2014-08-161-1/+2
|\
| * bionic has always had gettid.Elliott Hughes2014-08-201-1/+2
|/ | | | | Bug: 17049821 Change-Id: I309ecfad7e38cf664518a92d6812ffbd90060b79
* Merge "Update ziparchive usage to the new API."Piotr Jastrzebski2014-08-161-2/+3
|\
| * Update ziparchive usage to the new API.Piotr Jastrzebski2014-08-151-2/+3
| | | | | | | | | | Bug: 16162465 Change-Id: Iea4d39e1bb74be7ad9041aa3dbb5809d53f63faf
* | Merge "Avoid triggering StrictMode when closing a socket."Elliott Hughes2014-08-151-2/+5
|\ \
| * | Avoid triggering StrictMode when closing a socket.Elliott Hughes2014-08-151-2/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, we called getsockoptLinger unconditionally, using ENOTSOCK to recognize the non-socket case, but the cost of throwing an exception is so high (both on dalvik and art) that we worked around that by doing an fstat first. This was mostly fine, but fstat calls onReadFromDisk, which isn't true for the socket case (which causes upset for threads that are allowed to touch the network but not allowed to touch disk, which Chrome uses, even though it's not immediately obvious to me why that makes any sense). (cherry-pick of d636777d624428dfc51d1181f47602f389eb4cce.) Bug: 4972558 Bug: 12133112 Change-Id: Ic0b89d1f181e436b4f43c1c04c1f706883ab84c0
* | Merge "Fix parsing of fractional seconds."Narayan Kamath2014-08-152-2/+37
|\ \ | |/ |/|
| * Fix parsing of fractional seconds.Narayan Kamath2014-08-142-2/+37
|/ | | | | | | | | | | | | We were just parsing them as millisecond values, which is wrong. ".1" fractional second is 100 milliseconds (we were parsing it as 1 ms), and ".765432" fractional seconds is 765 milliseconds (we were parsing it as 765432ms. In most cases, this was hidden by the fact that we were formatting such values incorrectly as well. bug: 16969112 Change-Id: Id287684f78691090ac4a6c3029d7909f2c1e1310