summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pass getDexPath to Runtime.nativeLoadDmitriy Ivanov2015-03-203-23/+54
| | | | | | | | | getDexPath is used by Runtime.nativeLoad to open libraries directly from apk. Given that libraries are not compressed and are page-aligned. Bug: 8076853 Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* Merge "Set -Wno-deprecated-declarations to access deprecated IDNA2003 API."Narayan Kamath2015-03-191-0/+3
|\
| * Set -Wno-deprecated-declarations to access deprecated IDNA2003 API.Fredrik Roubert2015-03-191-0/+3
| | | | | | | | | | | | | | | | | | In libcore_icu_NativeIDN.cpp there are calls to the deprecated IDNA2003 API which means that this code as of ICU55 no longer will compile without specifying the -Wno-deprecated-declarations compiler flag. bug: 19823499 Change-Id: Id5cd5da0d6c3ce62a5c642c99364d29eaebe7709
* | Merge "Fix an ntohs/htons issue."Lorenzo Colitti2015-03-191-1/+1
|\ \
| * | 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
* | | Merge "Remove a superfluous cast."Lorenzo Colitti2015-03-191-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Remove a superfluous cast.Lorenzo Colitti2015-03-171-2/+2
| | | | | | | | Change-Id: I1b4b9d9160a66d0ce9aa2449526041d1c75d545d
* | Merge "Specify the base timestamp in RelativeTimeSpanString tests"Tao Bao2015-03-181-40/+38
|\ \
| * | Specify the base timestamp in RelativeTimeSpanString testsTao Bao2015-03-181-40/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to specify the timezone and the base time explicitly in RelativeTimeSpanString tests. Otherwise if using (base = System.currentTimeMillis()) with default timezone, it may not give a correct answer of "tomorrow" by adding 24 hours to base when it's around DST transitions. Bug: 19744876 Change-Id: I8fed9086ec8ebea6d837763fe7bc034fbd8e4181
* | | Merge "Fix misspelling of Kerberos"Brian Carlstrom2015-03-181-1/+1
|\ \ \
| * | | Fix misspelling of KerberosBrian Carlstrom2015-03-181-1/+1
|/ / / | | | | | | | | | Change-Id: I6473665bc00fa45d8a3941657791334e97df7c85
* | | Merge "Move null check rationale to sample code for clarity"Brian Carlstrom2015-03-181-6/+2
|\ \ \ | |/ / |/| |
| * | Move null check rationale to sample code for clarityBrian Carlstrom2015-03-181-6/+2
|/ / | | | | | | Change-Id: Ieceff37477ec3189bda4bcead98aa7e27fcce345
* | Merge "Remove executable permissions from java_lang_StringToReal.cpp"Narayan Kamath2015-03-171-0/+0
|\ \
| * | Remove executable permissions from java_lang_StringToReal.cppNarayan Kamath2015-03-171-0/+0
|/ / | | | | | | Change-Id: I0e36d41a822db1b9607543a9033f190eed5363c8
* | Merge "Add unit test for Timestamp#equals."Narayan Kamath2015-03-171-0/+8
|\ \
| * | Add unit test for Timestamp#equals.Narayan Kamath2015-03-171-0/+8
|/ / | | | | | | | | | | bug: 19756610 Change-Id: I2654643fefcb0402e34ff409c0cad1e1355cadc3
* | 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
* | | Merge "Late binding: specified Provider forces its use"Kenny Root2015-03-1610-5/+220
|\ \ \
| * | | Late binding: specified Provider forces its useKenny Root2015-03-1610-5/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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 "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
* | | | Merge "Expose the SocketAddress variant to bundled apps."Lorenzo Colitti2015-03-161-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Expose the SocketAddress variant to bundled apps.Lorenzo Colitti2015-03-161-0/+5
|/ / / | | | | | | | | | Change-Id: I6b7985f23c1063c0cf68a12bf510da032bbd3e94
* | | Merge "Also support IPv4 fallback in the SocketAddress version of sendto."Lorenzo Colitti2015-03-162-11/+34
|\ \ \
| * | | Also support IPv4 fallback in the SocketAddress version of sendto.Lorenzo Colitti2015-03-142-11/+34
| | | | | | | | | | | | | | | | Change-Id: I90bbc9661b0a48bb19c9c1c5aa4cd493f4dff2fa
* | | | Merge "Support packet sockets in libcore."Lorenzo Colitti2015-03-164-2/+98
|\ \ \ \ | |/ / /
| * | | Support packet sockets in libcore.Lorenzo Colitti2015-03-144-2/+98
| | | | | | | | | | | | | | | | | | | | Bug: 19704592 Change-Id: Ic424e4c36f6de028df4a3095f57a08b68da78033
* | | | 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
* | | | Merge "Add a version of sendto that takes a SocketAddress."Lorenzo Colitti2015-03-165-0/+44
|\ \ \ \ | |/ / /
| * | | Add a version of sendto that takes a SocketAddress.Lorenzo Colitti2015-03-145-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the byte[] version for now. The ByteBuffer version will be added later. Bug: 19704592 Change-Id: I35c5f305b5828ff3315e42aae72aa4b01839e2fc
* | | | Merge "Make it possible to use AF_INET sockets created by libcore."Lorenzo Colitti2015-03-162-26/+144
|\ \ \ \ | |/ / /
| * | | Make it possible to use AF_INET sockets created by libcore.Lorenzo Colitti2015-03-142-26/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces"Neil Fuller2015-03-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix for MulticastSocketTest for non-multicast interfacesNeil Fuller2015-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_setNetworkInterfaceLjava_net_NetworkInterface does not check that the interface supports multicast. Bug: 19232216 Change-Id: I755287c06c99f36d209a3a8d11b2c75fccfa630b
* | | | Merge "Remove ExemptionMechanismTest.test_finalize"Yohann Roussel2015-03-131-41/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove ExemptionMechanismTest.test_finalizeYohann Roussel2015-03-131-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was making assumption on compiler + runtime and it seems there's nothing left to test about finalizer in ExemptionMechanism anyway. Bug: 18911912 Change-Id: I79efffa065ea6e8380741aac5cd4764e05acc7f7
* | | | Merge "java.lang.reflect: Use only relevant modifiers when converting to string"Sergio Giro2015-03-136-6/+102
|\ \ \ \
| * | | | java.lang.reflect: Use only relevant modifiers when converting to stringSergio Giro2015-03-116-6/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Reflect removal of DSS cipher suites in Javadocs."Alex Klyubin2015-03-122-31/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
* | | | Merge "Replace work-around with proper DecimalFormatSymbols helper function."Narayan Kamath2015-03-111-2/+7
|\ \ \ \
| * | | | 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 2882e512: Merge "Add support for netlink sockets and addresses."Erik Kline2015-03-109-8/+211
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '2882e51204fdf7cc38c04adf1fc1b3b38c2a9f43': Add support for netlink sockets and addresses.
| * \ \ \ Merge "Add support for netlink sockets and addresses."Erik Kline2015-03-109-8/+211
| |\ \ \ \
| | * | | | Add support for netlink sockets and addresses.Erik Kline2015-03-099-8/+211
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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