summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c5952ec0: am 2b26994c: Merge "Mark ↵Elliott Hughes2014-09-082-8/+18
|\ | | | | | | | | | | | | libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure." into lmp-dev * commit 'c5952ec0d8c4c5a4e3fa01081871c2b549782986': Mark libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure.
| * am 2b26994c: Merge "Mark ↵Elliott Hughes2014-09-082-8/+18
| |\ | | | | | | | | | | | | | | | | | | libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure." into lmp-dev * commit '2b26994c5069c22c25d8456ba6fba7d9fd3d95ae': Mark libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure.
| | * Merge "Mark ↵Elliott Hughes2014-09-082-8/+18
| | |\ | | | | | | | | | | | | libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure." into lmp-dev
| | | * Mark ↵Elliott Hughes2014-09-052-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale a known failure. The good news is that for the first time we understand why this is failing. Too big to fix for L though, and not a regression. Bug: 17374604 Change-Id: If9c221ec9e3a401c4ce9a3de4ff8b7c0e747e814
* | | | am f48abd8f: Merge "Change ReferenceQueue.add to append at end of the ↵Mathieu Chartier2014-09-051-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unenqueued list" * commit 'f48abd8f339755928b516dca8a939a5b7b799bd4': Change ReferenceQueue.add to append at end of the unenqueued list
| * \ \ \ 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
* | | | | am 66fe5224: am d0ce9660: Merge "DecimalFormatSymbols with a null locale ↵Elliott Hughes2014-09-050-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | should throw." into lmp-dev * commit '66fe52246ffd22384843571088f94d7ee44a3d99': DecimalFormatSymbols with a null locale should throw.
| * | | | am d0ce9660: Merge "DecimalFormatSymbols with a null locale should throw." ↵Elliott Hughes2014-09-051-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'd0ce966016703de5783ac5097131d7a738d8b007': DecimalFormatSymbols with a null locale should throw.
| | * | | Merge "DecimalFormatSymbols with a null locale should throw." into lmp-devElliott Hughes2014-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 (cherry picked from commit fba9a7e32be3a80df36fe7b3f6ee839b68f35d2e) Change-Id: I84ae39442b4ba69296f3e85344fa4d7936ecbb81
* | | | | am 0b6ec55b: am b2f14571: Merge "Implement equals and hashCode in ↵Elliott Hughes2014-09-050-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ParameterizedTypeImpl" into lmp-dev * commit '0b6ec55bcb7417c0ac8ba393d82ba9cae9bd909d': Implement equals and hashCode in ParameterizedTypeImpl
| * | | | am b2f14571: Merge "Implement equals and hashCode in ParameterizedTypeImpl" ↵Elliott Hughes2014-09-052-4/+40
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'b2f145710d0a81d37045df0e8bfba2450e9718bd': Implement equals and hashCode in ParameterizedTypeImpl
| | * | | Merge "Implement equals and hashCode in ParameterizedTypeImpl" into lmp-devElliott Hughes2014-09-052-4/+40
| | |\ \ \
| | | * | | Implement equals and hashCode in ParameterizedTypeImplPiotr Jastrzebski2014-09-042-4/+40
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and GenericArrayTypeImpl. Bug: 14590652 Bug: https://code.google.com/p/android/issues/detail?id=74060 (cherry picked from commit c7dede2138e5b122cb1011a355e4f9f8e6d37856) Change-Id: I5b95f816e0596ca6f51dce5959433dc70b2c297d
* | | | | am 66a5fa59: am 019acff0: Merge "Make sure calendars are compared ↵Elliott Hughes2014-09-050-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | correctly." into lmp-dev * commit '66a5fa599de6651e9535d63f44a7070c0eadb442': Make sure calendars are compared correctly.
| * | | | am 019acff0: Merge "Make sure calendars are compared correctly." into lmp-devElliott Hughes2014-09-051-3/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '019acff099095fac32f2a0c51f6df79f1d709c01': Make sure calendars are compared correctly.
| | * | | Merge "Make sure calendars are compared correctly." into lmp-devElliott Hughes2014-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 (cherry picked from commit 2f3e9b30fb2646b9c9294825cf91d2b0dc3b57c5) Change-Id: I80411926b129b926cbbd115b22ee651f9d8f6d1b
* | | | | am 87bd1880: am 43334832: Merge "Timing hacks DO NOT MERGE" into lmp-devAnwar Ghuloum2014-09-052-0/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '87bd188036d5834b2b0becbbc3d26fe0f9318ead': Timing hacks DO NOT MERGE
| * | | | am 43334832: Merge "Timing hacks DO NOT MERGE" into lmp-devAnwar Ghuloum2014-09-052-0/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '433348326c496760dabee1130b17e684419cca4d': Timing hacks DO NOT MERGE
| | * | | Merge "Timing hacks DO NOT MERGE" into lmp-devAnwar Ghuloum2014-09-052-0/+44
| | |\ \ \
| | | * | | Timing hacks DO NOT MERGEAnwar Ghuloum2014-09-052-0/+44
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's submit to see if any issues remain Bug: 17310019 Change-Id: Ifef1b1645033adcf192d6ec9248456cae28cd09f
* | | | | am c9a79e62: Merge "DecimalFormatSymbols with a null locale should throw."Narayan Kamath2014-09-051-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'c9a79e62ee08665ce46fb08c8d1f659d4e78c058': DecimalFormatSymbols with a null locale should throw.
| * | | | 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
* | | | | | am aeecf3ec: Merge "Make sure calendars are compared correctly."Narayan Kamath2014-09-051-3/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'aeecf3ecfd7b6619db531e8febb4d58bbbc0f992': Make sure calendars are compared correctly.
| * | | | | 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
* | | | | am 32adcb4a: Merge "Fix race in finalizeAllEnqueued."Mathieu Chartier2014-09-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '32adcb4a34b40479154390a4f92d85805712b58c': Fix race in finalizeAllEnqueued.
| * | | | 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
* | | | | | am bbd514c8: Merge "Libcore: Add parameter to zygote hook"Andreas Gampe2014-09-041-4/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bbd514c856add7ed7cf362fae731e3737a257079': Libcore: Add parameter to zygote hook
| * | | | | 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
* | | | | | am f9ac85ca: am 2cc3d41f: Fix race in finalizeAllEnqueued.Mathieu Chartier2014-09-041-1/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit 'f9ac85ca7f1a22c088b8eb9887910e7cc2e9abf8': Fix race in finalizeAllEnqueued.
| * | | | | am 2cc3d41f: Fix race in finalizeAllEnqueued.Mathieu Chartier2014-09-041-1/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '2cc3d41ff2dfd673fa1ab4ef2a46525933d523ec': Fix race in finalizeAllEnqueued.
| | * | | | 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. Bug: 17371542 Bug: 17381967 Change-Id: I0455c665558397b70a88a97c59fe50090fa57401
* | | | | am fc5a9bde: Merge "Fix apache-harmony logging tests"Neil Fuller2014-09-044-27/+67
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'fc5a9bde9565f9d6d5aaf1155743a669c37f7f08': Fix apache-harmony logging tests
| * | | | 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
* | | | | am e19e6189: Merge "Rearrange a few of our MIME type registrations."Narayan Kamath2014-09-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e19e61898aa401d2a2803df6da6ac843f4822f98': Rearrange a few of our MIME type registrations.
| * | | | 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
* | | | | am 91dc2dd3: Merge "Fix SDK and docs build."Neil Fuller2014-09-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '91dc2dd3a30952ab4ab962cb885b43e81f39c739': Fix SDK and docs build.
| * | | | 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
* | | | | am d730cf65: Merge "Keep qtaguid quiet by not trying to untag non-sockets."Elliott Hughes2014-09-030-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd730cf6556b8e4d7e93e10e06766295ea63698ac': Keep qtaguid quiet by not trying to untag non-sockets.
| * | | | 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
generated by cgit v1.1 at 2025-03-15 14:42:27 +0000