summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge "libcore changes to support ConnectionPool cache flushing" into lmp-devNeil Fuller2014-09-092-0/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | libcore changes to support ConnectionPool cache flushingNeil Fuller2014-09-092-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A set of observer / listener components for network events. Party A, e.g. the Android ConnectivityManager, can make changes to network configuration that impacts the java network objects (e.g. connection pools, caches, etc.). Party B, e.g. Android libcore network components are interested in network configuration changes. The NetworkEventDispatcher enables Party A to communicate with Party B without hardcoding their details. Additional parties like B can be added. Bug: 17314604 Change-Id: I175bdf28662bafcf0c91acb51a3da5cbc2b69086
| * | | | | | | | | | | | 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 (cherry picked from commit 37477444ae4d6fae52258f9ea85d32d5a87ebef2) Change-Id: Ie6680df476518236037254546380a8255ad801ac
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | 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 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
| * | | | | | | | | | | | 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 c9a79e62: Merge "DecimalFormatSymbols with a null locale should throw."Narayan Kamath2014-09-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9a79e62ee08665ce46fb08c8d1f659d4e78c058': DecimalFormatSymbols with a null locale should throw.
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | 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 f9ac85ca: am 2cc3d41f: Fix race in finalizeAllEnqueued.Mathieu Chartier2014-09-041-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9ac85ca7f1a22c088b8eb9887910e7cc2e9abf8': 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-043-19/+67
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc5a9bde9565f9d6d5aaf1155743a669c37f7f08': Fix apache-harmony logging tests
| * | | | | | | | | | | Merge "Fix apache-harmony logging tests"Neil Fuller2014-09-043-19/+67
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix apache-harmony logging testsNeil Fuller2014-09-043-19/+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
| * | | | | | | | | | | | Rearrange a few of our MIME type registrations.Elliott Hughes2014-09-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Keep qtaguid quiet by not trying to untag non-sockets.Elliott Hughes2014-09-032-4/+14
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of f6cf9efb212e572dcd2e902ca461af6323793dbf.) Bug: 17203955 Change-Id: I0999fc0ff295986b92e31568d96e321b9e7ffb2c
* | | | | | | | | | | | am 3c4eb717: am 2086177b: Merge "Keep qtaguid quiet by not trying to untag ↵Elliott Hughes2014-09-032-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-sockets." into lmp-dev * commit '3c4eb717a8dabae361477f613223feb0d3dfaaf6': Keep qtaguid quiet by not trying to untag non-sockets.
| * | | | | | | | | | | Merge "Keep qtaguid quiet by not trying to untag non-sockets." into lmp-devElliott Hughes2014-09-022-4/+14
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Keep qtaguid quiet by not trying to untag non-sockets.Elliott Hughes2014-09-022-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203955 Change-Id: I0999fc0ff295986b92e31568d96e321b9e7ffb2c
* | | | | | | | | | | | | am 7f9653f5: am 55848681: Add additional field checks for deserialization.Neil Fuller2014-08-283-18/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f9653f5d02beff35b8704b3a075f2e581db6135': Add additional field checks for deserialization.
| * | | | | | | | | | | | Add additional field checks for deserialization.Neil Fuller2014-08-283-18/+37
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that a field is not static when deserializing. Contains some additional tests to confirm and document behavior and prevent regressions for field deserialization. Bug: 17202597 Change-Id: I80fe0f1f15b36852de09320a4daa89333e753903 (cherry picked from commit f4d72bcf5a9caa1d6cac74a018ab68dd87ec6d83)
* | | | | | | | | | | | am a828dd0d: am 0d9d7216: Merge "Rearrange a few of our MIME type ↵Elliott Hughes2014-08-261-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registrations." into lmp-dev * commit 'a828dd0d222956774ca77db08b1c7e40de3faa94': Rearrange a few of our MIME type registrations.
| * | | | | | | | | | | Rearrange a few of our MIME type registrations.Elliott Hughes2014-08-221-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on looking at IANA and wikipedia. Bug: 16978217 Change-Id: I0d28c6d53ec26c7d5501f722b66dd50595e2a6b4
* | | | | | | | | | | | am ec494368: Merge "Avoid wrapping Class in WeakReference when class loader ↵Ian Rogers2014-08-221-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is null." * commit 'ec494368f467ca5235a6a52ff6b03b97141fa17d': Avoid wrapping Class in WeakReference when class loader is null.
| * | | | | | | | | | | 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
| * | | | | | | | | | | | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-221-0/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of ebe417d7808ac5bce5bc14d36d6af4c31218326d.) Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881
* | | | | | | | | | | | am 2d6b952b: am 014531bf: Merge "Support narrow am/pm markers in ↵Elliott Hughes2014-08-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocaleData." into lmp-dev * commit '2d6b952b2a8fbc3f2637bd6b8ede1f3e931b2e1a': Support narrow am/pm markers in LocaleData.
| * | | | | | | | | | | Merge "Support narrow am/pm markers in LocaleData." into lmp-devElliott Hughes2014-08-221-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881
| * | | | | | | | | | | | Fix abuse of Runtime.freeMemory.Narayan Kamath2014-08-221-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 (cherry picked from commit df7e1dbcd0ff712f39b8e80023228ea4eb8531c2) Change-Id: I58dd8c006316e6f1195172cff8a262a96269c2b8
| * | | | | | | | | | | Merge "Avoid triggering StrictMode when closing a socket." into lmp-devElliott 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). Bug: 4972558 Bug: 12133112 Change-Id: Ic0b89d1f181e436b4f43c1c04c1f706883ab84c0
| * | | | | | | | | | | | Fix parsing of fractional seconds.Narayan Kamath2014-08-151-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 (cherry picked from commit e73ebc998a5b4017e805d750b395603d953d3c0c) Change-Id: I8401cfa65d3d6d424ae0b962e8c045d65a776183
| * | | | | | | | | | | | Allow Calendar.getInstance to be called with a null Locale.Narayan Kamath2014-08-145-0/+36
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocaleData.get was changed to throw for null locales instead of falling back to the default, so we need to adjust callers accordingly. Turns out all other callers would've thrown anyway (for different reasons) so this change makes those exceptions explicit and adds tests for them. bug: 16938922 (cherry picked from commit 148de94b69ad9ed98ebb1adf0e8eb1b1e9e33e1f) Change-Id: Id89961c9b9524776ef13f57d97b2bb73e19b4eb1
* | | | | | | | | | | | am 4dbeaf5c: Merge "Fix abuse of Runtime.freeMemory."Narayan Kamath2014-08-221-41/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dbeaf5cb275de51dd057939643a5d860c58c5a2': Fix abuse of Runtime.freeMemory.
| * | | | | | | | | | | 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
* | | | | | | | | | | | am cc3e0351: Merge "Avoid triggering StrictMode when closing a socket."Elliott Hughes2014-08-151-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc3e0351e273e85001900b73b138dc20a5766972': Avoid triggering StrictMode when closing a socket.
| * | | | | | | | | | | 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
* | | | | | | | | | | | am a6bb8774: Merge "Fix parsing of fractional seconds."Narayan Kamath2014-08-151-2/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6bb8774bf6ef792eb4af227b135b6cad815a1e3': Fix parsing of fractional seconds.
| * | | | | | | | | | | Fix parsing of fractional seconds.Narayan Kamath2014-08-141-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | am 0dcfa1d0: Merge "Allow Calendar.getInstance to be called with a null Locale."Narayan Kamath2014-08-145-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0dcfa1d088f114eb92a96b09eebf6172428ea6b5': Allow Calendar.getInstance to be called with a null Locale.
| * | | | | | | | | | | Allow Calendar.getInstance to be called with a null Locale.Narayan Kamath2014-08-135-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocaleData.get was changed to throw for null locales instead of falling back to the default, so we need to adjust callers accordingly. Turns out all other callers would've thrown anyway (for different reasons) so this change makes those exceptions explicit and adds tests for them. bug: 16938922 Change-Id: I3e77435a6b414b002b96a4f8deb44b51591c5a51
* | | | | | | | | | | | am eaed9b61: Merge "Make parameter name match comments for sdk build."Jeff Hao2014-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaed9b618b3d0b40d6d9a453f4cf8c6bf812f077': Make parameter name match comments for sdk build.
| * | | | | | | | | | | Make parameter name match comments for sdk build.Jeff Hao2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4dba2cfe07cf0c5ce28a0ff4540aa68d9c664a2a