summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* apache-http: Listening to the redirect URL.staging/cm-14.0-cafPrashant Shrivastava2016-08-242-10/+130
| | | | | | | | | Using reflection method we set the data block system property and block background data on the device on 3 redirect urls due to zero balance in the prepaid sim. CRs-Fixed: 1033837 Change-Id: I10dd1d8f81b837b02f37259dadcd15ee7e20835b
* Add support for closing multiple idle connectionsDevi Sandeep Endluri V V2016-08-244-7/+91
| | | | | | | | | | | | | | | | Apache-http stack can have multiple threads having open idle connections. Adding tcm support to close these idle connections Change-Id: I501e81bcc8c8514c68190ae11afaf44ab4e41741 Add TCM (TCP Connection Management) support TCM service indicates to close the TCP idle connections on time so that the application servers do not time out on connection and wake the modem cellular data connection up and cost power. Change-Id: I74465117c0254636dd79fe4336b07f1e8080ea88
* Don't build the stub org.apache.http.legacy.jar in PDK build.staging/cm-14.0Ying Wang2016-02-181-1/+1
| | | | Change-Id: Iaacafbacba49c233f9a3859382b93f27e6d6773d
* apache-http: Fix stubs generation.Narayan Kamath2016-02-121-1/+22
| | | | | | | | | | | | - We're asking doclava to generate stubs for all apache http packages. We must therefore point it to all apache-http sources (including the handful that live in frameworks/base). - Stop asking for stubs for android.net.*. These classes are still public frameworks API and their stubs will be present in android.jar. (cherry picked from commit 43ffae2b513e42623b213fbf08eea9255cb8ac7e) Change-Id: I626459d4547ae14555435da8de73645e47a3461e
* Merge "Unhook a bit from Conscrypt's implementation"Kenny Root2016-02-021-19/+14
|\
| * Unhook a bit from Conscrypt's implementationKenny Root2016-02-021-19/+14
|/ | | | | | | | | | | Conscrypt's TrustManagerImpl is changing from X509TrustManager to X509ExtendedTrustManager. apache-http is linking against an SDK release version without X509ExtendedTrustManager which causes errors. Remove the instanceof check to since it will work fine without it on the old and the new code. Change-Id: If4aedbd43f7716d8a3e15b2cfd2e218cb8d533a4
* Merge "Use hostname aware isCleartextTrafficPermitted"Chad Brubaker2016-01-261-4/+7
|\
| * Use hostname aware isCleartextTrafficPermittedChad Brubaker2016-01-261-4/+7
|/ | | | | | | | | | The cleartext traffic blocking feature of android.net.NetworkSecurityPolicy is being expanded to provide finer grained controls (per hostname). This change integrates the Apache HTTP stack with these finer grained controls. Bug: 22666071 Change-Id: If557d7fbd4df708305fbb7656026fc366ac4bb6d
* Merge "Use duck typing to call hostname aware checkServerTrusted"Chad Brubaker2016-01-231-1/+17
|\
| * Use duck typing to call hostname aware checkServerTrustedChad Brubaker2016-01-191-1/+17
|/ | | | | | | This supports X509TrustManagers other than TrustManagerImpl that implement the hostname aware checkServerTrusted. Change-Id: Icc4591b32f52c833a49180b198e5dd24294dde37
* am 72b40431: (-s ours) Merge "Start handshake before calling hostname verifier"Kenny Root2015-05-130-0/+0
|\ | | | | | | | | * commit '72b40431c28ad3fff177813d3bbd68e779302924': Start handshake before calling hostname verifier
| * Merge "Start handshake before calling hostname verifier"Kenny Root2015-05-131-0/+8
| |\
| | * Start handshake before calling hostname verifierKenny Root2015-05-121-0/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the hostname verifier calls SSLSocket#getSession() before the handshake has been started, it will implicitly start the handshake. However, it will swallow any errors and return the canonical invalid SSLSession instead. This makes it extremely difficult to debug issues. Instead start the handshake before calling into the verifier since we are guaranteed to be the first caller of #startHandshake() and won't cause a renegotiation. That will allow us to see the actual SSLHandshakeException if it occurs. Bug: 14975169 Bug: 17332309 Bug: 17524215 Bug: 17812533 Bug: 18507278 Bug: 19069992 Bug: 19378885 Bug: 19414083 Bug: 19550311 Bug: 19731556 Bug: 19853723 Bug: 20908941 Change-Id: Ie74ec12c8b131c7bf400a07fc91c78da4d5e470f
* | Use prebuilt stub org.apache.http.legacy for unbundled build.Ying Wang2015-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the stub org.apache.http.legacy.jar itself can be built from source against the SDK, its dependency conscrypt must be built against libcore-art. (Actually we could remove the droiddoc module apache-http-stubs-gen's dependency on conscrypt. It would lead doclava to complain error of unresolved symbols of conscrypt. Such error isn't fatal because the stub java files don't reference any conscrypt symbols.) Also by using prebuilt org.apache.http.legacy, unbundled branches don't need to pull in external/doclava and its many dependency projects. Bug: 20221594 Change-Id: I6fb4377d35a70ad544cb8a91695e23625365df60
* | Make org.apache.http.legacy a stubs target.Narayan Kamath2015-04-092-3/+6
| | | | | | | | | | | | | | Also, rename the non-stubs org.apache.http.legacy jar -> org.apache.http.legacy.boot and include it in the boot classpath. Change-Id: Ibcfa5429f6565e86ab03bbc793e20f1860e3821a
* | Build stubs for apache-httpNarayan Kamath2015-04-091-6/+87
| | | | | | | | | | | | | | | | Also, distribute those stubs with the SDK instead of the actual code. In a follow up change, we will use those stubs for building platform dependencies as well. Change-Id: If60624d095a69f69876f9cc32a8078c01e090a64
* | am aa83190c: Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin2015-03-301-0/+43
|\| | | | | | | | | * commit 'aa83190cb650e9b714f2b980aa29ece8f86d587a': Honor NetworkSecurityPolicy regarding cleartext traffic.
| * Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin2015-03-301-0/+43
| |\
| | * Honor NetworkSecurityPolicy regarding cleartext traffic.Alex Klyubin2015-03-271-0/+43
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes HttpClient instances honor the process-wide policy about cleartext network traffic. If cleartext network traffic is not permitted, then attempts to send a cleartext HTTP request will throw an IOException. This change is needed despite platform-provided HttpClient being deprecated because a large fraction of applications still use this HttpClient library to generate HTTP traffic instead of using URLConnection. HttpClient is modular -- most of its parts can be replaced with alternative implementations. Thus, this CL enforces the cleartext traffic policy in DefaultRequestDirector because RequestDirector is least commonly replaced (if ever) and there are no other RequestDirector implementations provided by the library. The cleartext policy is enforced pretty late in the process of emitting a request to give time for any HttpRequestInterceptor instances to see the request. This is because some apps use a HttpRequestInterceptor to enforce their own policies about cleartext HTTP such as catching accidental use of cleartext HTTP and reporting it to their servers for analysis. Bug: 19215516 Change-Id: I03687123080475581e7196d9bb8c0d006502d056
* | Archive org.apache.http.legacy.jarYing Wang2015-02-251-0/+3
| | | | | | | | | | Bug: 19505778 Change-Id: I31684ed7a88d1e766be1c41e0768345aa9af2557
* | Merge "Unbundle org.apache.http.legacy."Narayan Kamath2015-02-1325-72/+431
|\ \
| * | Unbundle org.apache.http.legacy.Narayan Kamath2015-02-0425-72/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets us build it from source on both unbundled and platform branches. The main changes are : - We need a placeholder "WebAddress" class that's used internally. The class will be deleted from the frameworks once the webview stops using it (sigh...) - Use TrafficStats instead of SocketTagger. - Remove @hide annotations because they don't matter any more. We're not building stubs any more, and apps in both unbundled and platform branches will compile directly against the jar. We don't care about any of that because this is all deprecated API and deleted from the API specification. bug: 18027885. Change-Id: I6b5f06db2e3e0e34ccd7264c15e1fe594e61862e
* | | Merge "Move apache specific portions of android.net.http to apache-http."Narayan Kamath2015-02-1341-1920/+7116
|\| |
| * | Move apache specific portions of android.net.http to apache-http.Narayan Kamath2015-02-0441-1920/+7116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and move some parts of apache-http into the framework. The parts that have been moved need to be in the bootclasspath because we have public API that returns org.apache.http.conn.ssl.SSLSocketFactory :( . This change also removes the placeholder library shim. bug: 18027885 Change-Id: I37aa7562bcd5e05191b83676fae4533e03b86d1d
* | | Add a file that proves the existence of unbundled-apache.Narayan Kamath2015-02-111-0/+4
|/ / | | | | | | | | | | | | | | The build system can use this as a test for whether we should add a dependency to the library by hand. bug: 18027885 Change-Id: I89eb870ed47928fdd815393f8fe6f64b2a69922e
* | am 1cbd67d9: am c7fe4b37: Merge "Fix @link annotation in documentation for ↵Elliott Hughes2015-01-281-1/+1
|\| | | | | | | | | | | | | hyperlink generation" * commit '1cbd67d91edfcedbfd28aac75c1c616ced66ab4a': Fix @link annotation in documentation for hyperlink generation
| * am c7fe4b37: Merge "Fix @link annotation in documentation for hyperlink ↵Elliott Hughes2015-01-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | generation" * commit 'c7fe4b3752acbf8a183fa6d4e07bc2acbb3448fd': Fix @link annotation in documentation for hyperlink generation
| | * Merge "Fix @link annotation in documentation for hyperlink generation"Elliott Hughes2015-01-281-1/+1
| | |\
| | | * Fix @link annotation in documentation for hyperlink generationRuey-Shi Rau2015-01-281-1/+1
| | |/ | | | | | | | | | | | | Change-Id: Ia01f2d4d523b2fbb3ed227f003218841e00e608c Signed-off-by: Ruey-Shi Rau <timrau@gmail.com>
* | / Add placeholder library for org.apache.http.legacy.Narayan Kamath2015-01-202-0/+44
|/ / | | | | | | | | | | | | | | | | | | This lets us move forward with the apache removal without being blocked on the finalization of the API for the previous release. We can drop the real library into place when we're free to make API removal changes again on master. bug: 18027885 Change-Id: I4aa62176e334939095f7a2c210c9180c8feb4019
* | am f2971864: Merge "Remove apache-http host build."Narayan Kamath2014-12-101-24/+0
|\| | | | | | | | | * commit 'f29718641d19e6ac724235d39159fc137154e65c': Remove apache-http host build.
| * Merge "Remove apache-http host build."Narayan Kamath2014-12-101-24/+0
| |\
| | * Remove apache-http host build.Narayan Kamath2014-12-081-24/+0
| |/ | | | | | | | | | | | | | | | | | | | | Was probably used by the dalvik host build once upon a time, but isn't referenced any longer. This is in preparation for changes that make this library depend on the frameworks so that it isn't treated specially. bug: 18027885 Change-Id: Iccf2ea4441eadea3400445d0542130c7362fd331
* / Deprecate apache-http.Narayan Kamath2014-10-23394-0/+2003
|/ | | | | bug: 18067888 Change-Id: I8d830c20e952734e2bb63da1e785094b7a783308
* am df55e5b2: am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am ↵staging/cm-12.0-cafstaging/cm-12.0Alex Klyubin2014-07-280-0/+0
|\ | | | | | | | | | | | | a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'df55e5b26b6b7cc90f9487cb0489cee1ed430d39': Stricter subject DN parsing for HTTPS hostname verification.
| * am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am ↵Alex Klyubin2014-07-281-32/+4
| |\ | | | | | | | | | | | | | | | | | | b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'f7a2b81e12cac8d9c11ddace681816942b6c6921': Stricter subject DN parsing for HTTPS hostname verification.
| | * am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter ↵Alex Klyubin2014-07-281-32/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | subject DN parsing for HTTPS hostname verification. * commit '6e294b4ef28f740b25c802c8875dd72ce534e45c': Stricter subject DN parsing for HTTPS hostname verification.
| | | * am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter subject DN ↵Alex Klyubin2014-07-281-32/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing for HTTPS hostname verification. * commit 'aeb8a635a5ede56e25131c7daf8e30ff38feda5d': Stricter subject DN parsing for HTTPS hostname verification.
| | | | * am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS ↵Alex Klyubin2014-07-281-32/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostname verification. * commit '945aab573e30fef6e521d98a2a8af4c89baffacf': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | * am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname ↵Alex Klyubin2014-07-281-32/+4
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification. * commit 'a8283f028ecee6bf241fa6c9a8f945a1d9f6f83e': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | | * am b260a116: Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-281-32/+4
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b260a116b1480df2bad2560986c60a707ea01c4f': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | | | * Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-251-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 (cherry picked from commit ec8c48dd748c81ba2cce518bf83cb9f236c30bae) Change-Id: I8124b54801481065df5230c1277e59c5e602b2b9
* | | | | | | | Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-241-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 Change-Id: Iedd27cec162167dad11a4fe477d4eaa3eba004b7
* | | | | | | | am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-131-8/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85ed0e10781c3c57343300a02556dd5131c450aa': Remove deprecated WITH_HOST_DALVIK.
| * | | | | | | Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-121-8/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-111-8/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13751317 Change-Id: I52f9f7d745f92ec3c5f0d3cb2eda6d2d12a73d27
* | | | | | | am db971290: Merge "Remove use of LOCAL_BUILD_HOST_DEX"Narayan Kamath2013-11-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db97129042e7baaab6eda49138d9328f1217aaca': Remove use of LOCAL_BUILD_HOST_DEX
| * | | | | | Merge "Remove use of LOCAL_BUILD_HOST_DEX"Narayan Kamath2013-11-251-2/+1
| |\ \ \ \ \ \
| | * | | | | | Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath2013-11-251-2/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5b16ab4c0186b6478df4a7f0c8f5c23a9e6c5f99) Change-Id: I7b44009bc878a5b9e65380dae7ad1893608a67ac
* | | | | | | Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath2013-11-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I650527fb0b95a71f8d33bb2bfbb165cbf89c783b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 09:25:02 +0000