summaryrefslogtreecommitdiffstats
path: root/luni/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fix an ntohs/htons issue.Lorenzo Colitti2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting between sockaddr_ll and PacketSocketAddress, we use ntohs in both directions. Converting from sockaddr_ll to PacketSocketAddress should use ntohs instead. This doesn't actually affect anything, because ntohs and htons identical, but it is conceptually wrong. Change-Id: Idd3cfcc11c4d6b7fed0c4b75a7935547f67eda12
* | | | | am 7e8f4d94: am d51ee9f7: Merge "Remove executable permissions from ↵Narayan Kamath2015-03-171-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | java_lang_StringToReal.cpp" * commit '7e8f4d94bfaf79a2ff7395f91a191441a8e6d577': Remove executable permissions from java_lang_StringToReal.cpp
| * | | | Remove executable permissions from java_lang_StringToReal.cppNarayan Kamath2015-03-171-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e36d41a822db1b9607543a9033f190eed5363c8
* | | | | am 8acc8d5e: am 79c17dc2: Merge "Libcore: Avoid double-checked locking"Andreas Gampe2015-03-163-70/+68
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8acc8d5ee4100828e579e2c3a18761ff0ed2b40a': Libcore: Avoid double-checked locking
| * | | | Merge "Libcore: Avoid double-checked locking"Andreas Gampe2015-03-163-70/+68
| |\ \ \ \
| | * | | | Libcore: Avoid double-checked lockingAndreas Gampe2015-03-153-70/+68
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I77605ad05ac5e9dfac07f40a2280221f9c641c65
* | | | | am b612f95a: am 464b9044: Merge "Late binding: specified Provider forces its ↵Kenny Root2015-03-164-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | use" * commit 'b612f95a9f5db47863286570163e0c90afddcd3d': Late binding: specified Provider forces its use
| * | | | Merge "Late binding: specified Provider forces its use"Kenny Root2015-03-164-4/+4
| |\ \ \ \
| | * | | | Late binding: specified Provider forces its useKenny Root2015-03-164-4/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Provider is specified in a call to Signature#getInstance, Cipher#getInstance, KeyAgreement#getInstance, or Mac#getInstance, it should return that provider no matter if the properties on that provider say it should support it. Bug: 19730263 Change-Id: I56045e4cb470a0e1aa0e108a443e04043467c475
* | | | | am 0664c4e9: am 869c6f25: Merge "Libcore: Fix superfluous ternary in ↵Andreas Gampe2015-03-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | BufferedInputStream" * commit '0664c4e9cdbaccb2e34e03bd6dcab36702f5fa6c': Libcore: Fix superfluous ternary in BufferedInputStream
| * | | | Merge "Libcore: Fix superfluous ternary in BufferedInputStream"Andreas Gampe2015-03-161-1/+1
| |\ \ \ \
| | * | | | Libcore: Fix superfluous ternary in BufferedInputStreamAndreas Gampe2015-03-151-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | At the position, result is already checked to be positive. Change-Id: I3847022820294f76b944ce49d9ef8e8629ddb350
* | | | | Merge "Use uppercase for hex encoded strings."Narayan Kamath2015-03-161-1/+1
|\ \ \ \ \
| * | | | | Use uppercase for hex encoded strings.Narayan Kamath2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For backwards compatibility with the apache code this is replacing. Several callers compare encoded strings for byte equality. bug: 19731588 Change-Id: I2e96abcabd69ba6d48d341eafe1f8075fff880ee
* | | | | | am 5bf1fb2a: am 87409364: Merge "Libcore: Fix infinite loop"Andreas Gampe2015-03-161-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '5bf1fb2add7eae7ee03ca3747a615967d3f152c0': Libcore: Fix infinite loop
| * | | | | Merge "Libcore: Fix infinite loop"Andreas Gampe2015-03-161-1/+1
| |\ \ \ \ \
| | * | | | | Libcore: Fix infinite loopAndreas Gampe2015-03-151-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly dispatch to wrapped object. Change-Id: Ia2789f92ddeb61f6b74789220f9a50dfdcf4fd3b
* | | | | | am 6ff8e03e: am ba6caa1c: Merge "Expose the SocketAddress variant to bundled ↵Lorenzo Colitti2015-03-161-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps." * commit '6ff8e03ef67c204565ceb3679029a0b88bdfaa62': Expose the SocketAddress variant to bundled apps.
| * | | | | Expose the SocketAddress variant to bundled apps.Lorenzo Colitti2015-03-161-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I6b7985f23c1063c0cf68a12bf510da032bbd3e94
* | | | | am 29e698e3: am 71f07546: Merge "Also support IPv4 fallback in the ↵Lorenzo Colitti2015-03-161-6/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | SocketAddress version of sendto." * commit '29e698e33247219311a98756833439a7a4f1e71a': Also support IPv4 fallback in the SocketAddress version of sendto.
| * | | | Merge "Also support IPv4 fallback in the SocketAddress version of sendto."Lorenzo Colitti2015-03-161-6/+21
| |\ \ \ \
| | * | | | Also support IPv4 fallback in the SocketAddress version of sendto.Lorenzo Colitti2015-03-141-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90bbc9661b0a48bb19c9c1c5aa4cd493f4dff2fa
* | | | | | am 1dacfbb4: am 7d6411b7: Merge "Support packet sockets in libcore."Lorenzo Colitti2015-03-163-2/+76
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1dacfbb464d8d21c312cca681a1a297e0f632f08': Support packet sockets in libcore.
| * | | | | Merge "Support packet sockets in libcore."Lorenzo Colitti2015-03-163-2/+76
| |\ \ \ \ \ | | |/ / / /
| | * | | | Support packet sockets in libcore.Lorenzo Colitti2015-03-143-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19704592 Change-Id: Ic424e4c36f6de028df4a3095f57a08b68da78033
* | | | | | am 1ab902ac: am 9322c6d2: Merge "Add a PacketSocketAddress class that ↵Lorenzo Colitti2015-03-161-0/+64
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | represents sockaddr_ll." * commit '1ab902acc995d6ef7a297959d57b6d8715a0bd2a': Add a PacketSocketAddress class that represents sockaddr_ll.
| * | | | | Merge "Add a PacketSocketAddress class that represents sockaddr_ll."Lorenzo Colitti2015-03-161-0/+64
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add a PacketSocketAddress class that represents sockaddr_ll.Lorenzo Colitti2015-03-141-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19704592 Change-Id: Icc748e2764d0915cc7ca1924aaf51ca0c25b669d
* | | | | | am 51e455d0: am 8bce9ae7: Merge "Add a version of sendto that takes a ↵Lorenzo Colitti2015-03-164-0/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SocketAddress." * commit '51e455d0366267008c3efe1ca9ca7563f5a2bcfc': Add a version of sendto that takes a SocketAddress.
| * | | | | Merge "Add a version of sendto that takes a SocketAddress."Lorenzo Colitti2015-03-164-0/+25
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add a version of sendto that takes a SocketAddress.Lorenzo Colitti2015-03-144-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the byte[] version for now. The ByteBuffer version will be added later. Bug: 19704592 Change-Id: I35c5f305b5828ff3315e42aae72aa4b01839e2fc
* | | | | | am 4beb74e0: am db419d06: Merge "Make it possible to use AF_INET sockets ↵Lorenzo Colitti2015-03-161-22/+54
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created by libcore." * commit '4beb74e0ae832698c94fb298be6e122e70bebcaa': Make it possible to use AF_INET sockets created by libcore.
| * | | | | Merge "Make it possible to use AF_INET sockets created by libcore."Lorenzo Colitti2015-03-161-22/+54
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Make it possible to use AF_INET sockets created by libcore.Lorenzo Colitti2015-03-141-22/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, it's possible to create AF_INET sockets using: Libcore.os.socket(AF_INET, ... but such sockets can't be used for anything, because os.bind() and os.connect() automatically convert IPv4 addresses to IPv4-mapped addresses (e.g., 192.0.2.1 to ::ffff:192.0.2.1), and passing a sockaddr_in6 to a system call on an AF_INET socket causes the kernel to return EAFNOSUPPORT. When this happens, retry using an unmapped IPv4 address. We could also call getsockopt(SOL_SOCKET, SO_DOMAIN) before every system call and pass in the appropriate socket address structure, but that would cause these socket functions to make two system calls instead of one and would probably halve the performance of sendto(). This way, there's only one system call for most sockets (including all AF_INET6 sockets created in Java), and two system calls only in the rare case of a socket that's explicitly created as AF_INET. Bug: 18558481 Bug: 19704592 Change-Id: I71b3728b6a72b742e156d4c60db65e88b9a9e51e
* | | | | am e83e65b4: am 0202f7b4: Merge "java.lang.reflect: Use only relevant ↵Sergio Giro2015-03-131-0/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | modifiers when converting to string" * commit 'e83e65b47b3688ab12e31aeecd5ad19432c9de51': java.lang.reflect: Use only relevant modifiers when converting to string
| * | | | Merge "java.lang.reflect: Use only relevant modifiers when converting to string"Sergio Giro2015-03-131-0/+19
| |\ \ \ \
| | * | | | java.lang.reflect: Use only relevant modifiers when converting to stringSergio Giro2015-03-111-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modifiers not relevant might be used to encode internal information (eg bridge methods) that shouldn't be displayed when converting to string bug: 18488857 Change-Id: Ie82ed513b58083a795549a708197f1db52ffb796
* | | | | | am e1e9f406: am 610d8c08: Merge "Reflect removal of DSS cipher suites in ↵Alex Klyubin2015-03-132-31/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Javadocs." * commit 'e1e9f406d4091be66d38ff8d204f74b85c5d657c': Reflect removal of DSS cipher suites in Javadocs.
| * | | | | Reflect removal of DSS cipher suites in Javadocs.Alex Klyubin2015-03-122-31/+29
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Android 5.1 (API Level 22) is out, Javadocs can mention that DSS TLS/SSL cipher suites were removed after API Level 22. See fef7818155899c092e6741de049fb7601dfcaf73. Bug: 17409664 Change-Id: Ibd9da7d3056358492f25695f4949e460f1c98d48
* | | | | am db957cb4: am a2e51f77: Merge "Replace work-around with proper ↵Narayan Kamath2015-03-131-2/+7
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | DecimalFormatSymbols helper function." * commit 'db957cb415c1ccaf35353f41172e6c6dfcf62403': Replace work-around with proper DecimalFormatSymbols helper function.
| * | | Replace work-around with proper DecimalFormatSymbols helper function.Fredrik Roubert2015-03-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper function createWithLastResortData() was introduced in ICU 4.8 and eliminates the need to call the private default constructor: http://bugs.icu-project.org/trac/ticket/7392 Change-Id: I6d615b23c28c449442aeab6d37b7d92e844a7ae8
* | | | am 24c68680: am 649f614e: am 2882e512: Merge "Add support for netlink ↵Erik Kline2015-03-108-8/+195
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | sockets and addresses." * commit '24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb': Add support for netlink sockets and addresses.
| * | | am 2882e512: Merge "Add support for netlink sockets and addresses."Erik Kline2015-03-108-8/+195
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '2882e51204fdf7cc38c04adf1fc1b3b38c2a9f43': Add support for netlink sockets and addresses.
| | * \ \ Merge "Add support for netlink sockets and addresses."Erik Kline2015-03-108-8/+195
| | |\ \ \
| | | * | | Add support for netlink sockets and addresses.Erik Kline2015-03-098-8/+195
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally: - support bind and connect calls with SocketAddresses - getsockname and getpeername can return a NetlinkSocketAddress Developed in conjunction with: https://android-review.googlesource.com/135490 Bug: 18581716 Change-Id: I760a06cdb9bdb26c734fb02cf668a94de982e2b6
* | | | | am d34cf085: am 53813be9: am d61d442a: Merge "Pre-initialize more by moving ↵Andreas Gampe2015-03-102-13/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | bad fields" * commit 'd34cf085ddca2c02709f5c8fc9524385a7208a30': Pre-initialize more by moving bad fields
| * | | | am d61d442a: Merge "Pre-initialize more by moving bad fields"Andreas Gampe2015-03-092-13/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd61d442a5cd0f0f2e1adca26d73f1423319e2110': Pre-initialize more by moving bad fields
| | * | | Merge "Pre-initialize more by moving bad fields"Andreas Gampe2015-03-092-13/+15
| | |\ \ \
| | | * | | Pre-initialize more by moving bad fieldsKenny Root2015-03-042-13/+15
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the fields were causing the classes to not be initialized, so move them to NoImagePreloadHolder. This will allow more of the boot class path to be initialized at compile-time, while the holders can still be initialized in the zygote. This was separated out from https://android-review.googlesource.com/136700 and updated for zygote initialization. Bug: 19498458 Bug: 19542228 Change-Id: If35af41c10e68c71f71b44ce0cc09c56dac310c6
* | | | | am f3fc9905: am f7e0ade3: am 98450f57: Merge "Explicitly specify the icu:: ↵Elliott Hughes2015-03-0816-228/+228
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | namespace." * commit 'f3fc9905adbadda673a90e4e8e06c75da64775a3': Explicitly specify the icu:: namespace.