summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Remove unnecessary include directives."Elliott Hughes2014-12-152-9/+2
|\ \
| * | Remove unnecessary include directives.Elliott Hughes2014-12-152-9/+2
| | | | | | | | | | | | | | | | | | These are all picked up by virtue of the libraries that we use. Change-Id: Ib5e86c65d53f3448d5f1d0c0d24f0f63ef5f1868
* | | Merge "Move GC daemon locking logic into heap"Mathieu Chartier2014-12-152-21/+13
|\ \ \ | |/ / |/| |
| * | Move GC daemon locking logic into heapMathieu Chartier2014-12-152-21/+13
|/ / | | | | | | | | | | | | | | Fixes deadlock caused by acquirng the mutator lock while synchronizing on the daemon thread. Bug: 18739541 Change-Id: Ib3ac3788081d3d471195a6e3a8ed163237616a4f
* | Merge "Update ByteBuffer positions in Posix.* functions."Narayan Kamath2014-12-155-45/+176
|\ \
| * | Update ByteBuffer positions in Posix.* functions.Narayan Kamath2014-12-155-45/+176
|/ / | | | | | | | | | | | | | | | | | | | | Also add tests in libcore.io.OsTest and update (and simplify) callers that were updating the position themselves. bug: 18641009 (cherry picked from commit f3b61eaf1931ae8393e54202a717334a4971ebdf) Change-Id: I8a810b2dfde7c13278807381bdfe7f532a3481a0
* | Merge "When connecting to a SOCKS proxy, use the resolved IP"Neil Fuller2014-12-151-7/+3
|\ \
| * | When connecting to a SOCKS proxy, use the resolved IPNeil Fuller2014-12-081-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed while inspecting the code. In HttpURLConnection a similar change was made recently (commit 797fdc6cc6bf16372e9464f189b535148f944ce9). Previously if the Proxy was specified with a resolved InetSocketAddress (i.e. one with a specific IP address already determined) the hostname would still be used to work out an IP address to connect to. For host names with multiple IPs the host connected to could be a different one than the one specified. Now if the InetAddress has been resolved it will be used. In the case where the InetAddress is bad this may delay DNS / resolution errors to later in the connection process. It will, however, avoid the "connect to a different host" issue, and avoid a reverse DNS lookup here when the host is not yet known. Change-Id: I46df5c38942f2d356ba2fd4541e0269021fd6496
* | | Merge "Fix InetSocketAddress.getHostString(): return the name if available"Neil Fuller2014-12-154-1/+55
|\ \ \
| * | | Fix InetSocketAddress.getHostString(): return the name if availableNeil Fuller2014-12-034-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getHostString() would return the IP address in one of the three scenarios possible: 1) InetSocketAddress created with a name - already worked, name returned. 2) InetSocketAddress create with an InetAddress with only an address - already worked, address returned. 3) InetSocketAddress create with an InetAddress with an address and name: would return the address. Change-Id: Id9d1addda5cef589ac56db5397e00e842cf8c5d7
* | | | Merge "Fix Mac build (control reaches end of non-void function)."Elliott Hughes2014-12-131-0/+1
|\ \ \ \
| * | | | Fix Mac build (control reaches end of non-void function).Elliott Hughes2014-12-121-0/+1
|/ / / / | | | | | | | | | | | | Change-Id: I94d85f1848db7c787f423ca9e7f7695ffd754a56
* | | | Merge "Fix Mac build (unused parameter)."Elliott Hughes2014-12-131-1/+1
|\ \ \ \
| * | | | Fix Mac build (unused parameter).Elliott Hughes2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I164eb9083cc17f858dcbb0da046184440881395d
* | | | | Merge "Only allow one requestGC at a time"Mathieu Chartier2014-12-131-0/+6
|\ \ \ \ \
| * | | | | Only allow one requestGC at a timeMathieu Chartier2014-12-121-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes possible deadlock caused by Thread.getAllStackTraces Thread.getAllStackTraces suspends all of the threads. If one of the threads is a thread which holds the GC daemon lock then we may deadlock when we allocate the stack trace. This happens if we get a concurrent GC request when we are allocating the stack trace elements. To fix the deadlock we now only allow a single thread to requestGC at the same time. Credits: yamauchi, hboehm Bug: 18661622 Change-Id: Ia25598e5daa8ff2dc3aa976148d5ff6afa6960f0
* | | | | Merge "Remove dependency on AndroidConfig.h."Elliott Hughes2014-12-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove dependency on AndroidConfig.h.Elliott Hughes2014-12-121-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Ia21083b0392cc5acf5b1bbd7637a0cd0dd1fb01b
* | | | Merge "Fix Mac build."Elliott Hughes2014-12-121-0/+4
|\ \ \ \
| * | | | Fix Mac build.Elliott Hughes2014-12-121-0/+4
|/ / / / | | | | | | | | | | | | Change-Id: I827c6a8abf37ae181af959b4fd721e2092519fbf
* | | | Merge "Fix native registration."Elliott Hughes2014-12-121-1/+1
|\ \ \ \
| * | | | Fix native registration.Elliott Hughes2014-12-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | I thought I'd tested my previous change but hadn't. Change-Id: Ie121b571cc2f767dd4bbe10291a56fe31496e6cc
* | | | Merge "Add pipe2 and O_CLOEXEC to the libcore POSIX API."Elliott Hughes2014-12-129-9/+13
|\ \ \ \
| * | | | Add pipe2 and O_CLOEXEC to the libcore POSIX API.Elliott Hughes2014-12-129-9/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | @hide right now, but we should expose these at some point. Bug: 18719692 Change-Id: I0a73606cf089ed307d1ab2916a7df28b3c45aaf0
* | | | Merge "Use EMPTY_ITERATOR for EmptyList"Calin Juravle2014-12-121-0/+4
|\ \ \ \
| * | | | Use EMPTY_ITERATOR for EmptyListCalin Juravle2014-12-121-0/+4
|/ / / / | | | | | | | | | | | | Change-Id: Ic286c8fa6b01ba21211c0bedac66fb1b15221b1a
* | | | Merge "Remove a workaround for an icu4c header file hack."Elliott Hughes2014-12-111-3/+0
|\ \ \ \
| * | | | Remove a workaround for an icu4c header file hack.Elliott Hughes2014-12-111-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | The hack has been removed. Change-Id: Ia70f0cf05a47c68351e97d77b0675cbef67891d0
* | | | Merge "Add epub to MimeUtils map."Ben Murdoch2014-12-111-0/+1
|\ \ \ \
| * | | | Add epub to MimeUtils map.Ben Murdoch2014-12-111-0/+1
|/ / / / | | | | | | | | | | | | | | | | Bug: 18414102 Change-Id: Ie36f33e0cef04133ddb521d1672d3061cc2197bd
* | | | Merge "Don't include private bionic headers."Elliott Hughes2014-12-112-8/+8
|\ \ \ \
| * | | | Don't include private bionic headers.Elliott Hughes2014-12-102-8/+8
|/ / / / | | | | | | | | | | | | Change-Id: I25691f095e1b6b2009c01b6e990fffb84b12f7f2
* | | | Merge "Fix libcore.java.net.OldCookieHandlerTest#test_get_put()"Narayan Kamath2014-12-091-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix libcore.java.net.OldCookieHandlerTest#test_get_put()Wei Liu2014-12-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Bug: 18619181 (cherry picked from commit 065ee8445cd5b9041d5643ab3313bdd09b75dc10) Change-Id: I7aebb476011421f50e28eba2c02c1e2702c9df99
* | | Merge "Assert default SSLSocketFactory and HostnameVerifier actually used."Alex Klyubin2014-12-081-0/+115
|\ \ \ | |_|/ |/| |
| * | Assert default SSLSocketFactory and HostnameVerifier actually used.Alex Klyubin2014-12-041-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds tests to assert that default SSLSocketFactory and HostnameVerifier of HttpsURLConnection are actually used for new instances of HttpsURLConnection. The contract of HttpsURLConnection.get/setDefaultHostnameVerifier and HttpsURLConnection.get/setDefaultSSLSocketFactory is that the HostnameVerifier and SSLSocketFactory instances returned/set via these methods are used for new instances of HttpsURLConnection. Bug: 18481199 Change-Id: Id976c2fc31f0e3efed9284860aa35144a729dabb
* | | Merge "Track date format changes for es_ES and es_US."Narayan Kamath2014-12-081-14/+14
|\ \ \
| * | | Track date format changes for es_ES and es_US.Narayan Kamath2014-12-081-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | bug: 18478959 Change-Id: Ie240bd0254f3aa3e5c75464393e73ff7067a91ac
* | | | Merge "Track more CLDR-26 updates."Narayan Kamath2014-12-082-13/+7
|\ \ \ \
| * | | | Track more CLDR-26 updates.Narayan Kamath2014-12-052-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - PDT goes from "heure avancée du Pacifique" to "heure d’été du Pacifique" for Locale.FRANCE - Remove test for "Iran Daylight time" and rewrite it as a test for non hour offsets. Change-Id: Iecc9b587cbce6db3d949466505c10729c9a48d1b
* | | | | Merge "cacerts uses MD5-based file names -- fix README accordingly."Alex Klyubin2014-12-051-1/+1
|\ \ \ \ \
| * | | | | cacerts uses MD5-based file names -- fix README accordingly.Alex Klyubin2014-12-051-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the README to match the actual behavior of the platform. The README file didn't get updated during the upgrade to OpenSSL version which changed how subject_hash computes the hash. Android still uses the old (MD5-based) way of computing the hash. Thus, the correct switch to OpenSSL is -subject_hash_old. The files under cacerts directory are all named using the old hash -- no need to rename. Change-Id: Ifc6de291d93ed5d879a754bb49410e6604b32ec9
* | | | | Merge "Update expectations, tests don't fail."Nicolas Geoffray2014-12-051-2/+0
|\ \ \ \ \
| * | | | | Update expectations, tests don't fail.Nicolas Geoffray2014-12-051-2/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I26b1e65db8814833dff0607db0bd4c5dadef2957
* | | | | Merge "Get rid of Support_Configuration.SpecialInetTestAddress ..."Narayan Kamath2014-12-051-359/+14
|\ \ \ \ \
| * | | | | Get rid of Support_Configuration.SpecialInetTestAddress ...Narayan Kamath2014-12-041-359/+14
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... aka. "www.google.com" and lots of other unused support configuration values. Change-Id: I07f07d656e77317a50ac54dda07f493437c15e58
* | | | | Merge "Fix failing socket tests."Narayan Kamath2014-12-055-49/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix failing socket tests.Narayan Kamath2014-12-045-49/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use bogus numeric addresses instead of invalid hostnames to make InetAddress.getAllByName fail before we ask a DNS server. This guards against flakiness caused by evil DNS servers. Note that from an API perspective, Socket* and SSLSocket* don't care about *why* getAllByName failed, just that it did. This change also fixes a test that was asserting that the exception we throw contains a useful error message. Again, this test was changed to use a broken numeric address. bug: 18575971 Change-Id: I0b49e5e66717dc29a3401f45af0ef2d5bb955219
* | | | | Merge "Modernize requirements for platform-default HostnameVerifier."Alex Klyubin2014-12-041-13/+58
|\ \ \ \ \
| * | | | | Modernize requirements for platform-default HostnameVerifier.Alex Klyubin2014-12-041-13/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the requirements for platform-default HostnameVerifier up to date with the intersection of RFC 2818 and Baseline Requirements. The changes are: * Absolute domain names are fully supported. All presented hostnames are treated as absolute domain names. All domain names in server certificates are treated as absolute domain names as well. * Wildcard character (*) is permitted only in the left-most domain name label and must be the only character in that label. For example, *.example.com is permitted, while *a.example.com, a*.example.com, a*b.example.com, a.*.example.com are not permitted. * Wildcard character (*) must match exactly one domain name label. For example, *.example.com matches www.example.com, but does not match example.com or www.test.example.com. * Wildcard pattern cannot mach single-label domain names: * and *. patterns are rejected. * Wildcard character (*) is not supported in presented host names. Bug: 17482685 Bug: 17548724 Bug: 17552202 Bug: 17715547 Change-Id: I1c2b37847c9ba27d70da6c11a13c9bb3880d38c1
generated by cgit v1.1 at 2025-02-10 05:33:54 +0000