summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-18Don't build the stub org.apache.http.legacy.jar in PDK build.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseYing Wang
Change-Id: Iaacafbacba49c233f9a3859382b93f27e6d6773d
2016-02-12apache-http: Fix stubs generation.Narayan Kamath
- 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
2016-02-02Merge "Unhook a bit from Conscrypt's implementation"Kenny Root
2016-02-02Unhook a bit from Conscrypt's implementationKenny Root
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
2016-01-26Merge "Use hostname aware isCleartextTrafficPermitted"Chad Brubaker
2016-01-26Use hostname aware isCleartextTrafficPermittedChad Brubaker
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
2016-01-23Merge "Use duck typing to call hostname aware checkServerTrusted"Chad Brubaker
2016-01-19Use duck typing to call hostname aware checkServerTrustedChad Brubaker
This supports X509TrustManagers other than TrustManagerImpl that implement the hostname aware checkServerTrusted. Change-Id: Icc4591b32f52c833a49180b198e5dd24294dde37
2015-05-13am 72b40431: (-s ours) Merge "Start handshake before calling hostname verifier"Kenny Root
* commit '72b40431c28ad3fff177813d3bbd68e779302924': Start handshake before calling hostname verifier
2015-05-13Merge "Start handshake before calling hostname verifier"android-m-preview-2android-m-preview-1android-m-previewKenny Root
2015-05-12Start handshake before calling hostname verifierKenny Root
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
2015-04-14Use prebuilt stub org.apache.http.legacy for unbundled build.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseandroid-live-tvYing Wang
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
2015-04-09Make org.apache.http.legacy a stubs target.Narayan Kamath
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
2015-04-09Build stubs for apache-httpNarayan Kamath
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
2015-03-30am aa83190c: Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin
* commit 'aa83190cb650e9b714f2b980aa29ece8f86d587a': Honor NetworkSecurityPolicy regarding cleartext traffic.
2015-03-30Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soongAlex Klyubin
2015-03-27Honor NetworkSecurityPolicy regarding cleartext traffic.Alex Klyubin
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
2015-02-25Archive org.apache.http.legacy.jarYing Wang
Bug: 19505778 Change-Id: I31684ed7a88d1e766be1c41e0768345aa9af2557
2015-02-13Merge "Unbundle org.apache.http.legacy."Narayan Kamath
2015-02-13Merge "Move apache specific portions of android.net.http to apache-http."Narayan Kamath
2015-02-11Add a file that proves the existence of unbundled-apache.Narayan Kamath
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
2015-02-04Unbundle org.apache.http.legacy.Narayan Kamath
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
2015-02-04Move apache specific portions of android.net.http to apache-http.Narayan Kamath
.. 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
2015-01-28am 1cbd67d9: am c7fe4b37: Merge "Fix @link annotation in documentation for ↵Elliott Hughes
hyperlink generation" * commit '1cbd67d91edfcedbfd28aac75c1c616ced66ab4a': Fix @link annotation in documentation for hyperlink generation
2015-01-28am c7fe4b37: Merge "Fix @link annotation in documentation for hyperlink ↵Elliott Hughes
generation" * commit 'c7fe4b3752acbf8a183fa6d4e07bc2acbb3448fd': Fix @link annotation in documentation for hyperlink generation
2015-01-28Merge "Fix @link annotation in documentation for hyperlink generation"Elliott Hughes
2015-01-28Fix @link annotation in documentation for hyperlink generationRuey-Shi Rau
Change-Id: Ia01f2d4d523b2fbb3ed227f003218841e00e608c Signed-off-by: Ruey-Shi Rau <timrau@gmail.com>
2015-01-20Add placeholder library for org.apache.http.legacy.Narayan Kamath
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
2014-12-10am f2971864: Merge "Remove apache-http host build."Narayan Kamath
* commit 'f29718641d19e6ac724235d39159fc137154e65c': Remove apache-http host build.
2014-12-10Merge "Remove apache-http host build."android-wear-5.0.0_r1lollipop-wear-releaseNarayan Kamath
2014-12-08Remove apache-http host build.Narayan Kamath
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
2014-10-23Deprecate apache-http.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaseandroid-live-tv-l-mr1Narayan Kamath
bug: 18067888 Change-Id: I8d830c20e952734e2bb63da1e785094b7a783308
2014-07-28am df55e5b2: am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am ↵android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-devlollipop-cts-releaseAlex Klyubin
a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'df55e5b26b6b7cc90f9487cb0489cee1ed430d39': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am ↵Alex Klyubin
b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'f7a2b81e12cac8d9c11ddace681816942b6c6921': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter ↵Alex Klyubin
subject DN parsing for HTTPS hostname verification. * commit '6e294b4ef28f740b25c802c8875dd72ce534e45c': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter subject DN ↵Alex Klyubin
parsing for HTTPS hostname verification. * commit 'aeb8a635a5ede56e25131c7daf8e30ff38feda5d': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS ↵Alex Klyubin
hostname verification. * commit '945aab573e30fef6e521d98a2a8af4c89baffacf': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname ↵Alex Klyubin
verification. * commit 'a8283f028ecee6bf241fa6c9a8f945a1d9f6f83e': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-28am b260a116: Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin
* commit 'b260a116b1480df2bad2560986c60a707ea01c4f': Stricter subject DN parsing for HTTPS hostname verification.
2014-07-25Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin
This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 (cherry picked from commit ec8c48dd748c81ba2cce518bf83cb9f236c30bae) Change-Id: I8124b54801481065df5230c1277e59c5e602b2b9
2014-07-24Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin
This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 Change-Id: Iedd27cec162167dad11a4fe477d4eaa3eba004b7
2014-06-13am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit '85ed0e10781c3c57343300a02556dd5131c450aa': Remove deprecated WITH_HOST_DALVIK.
2014-06-12Merge "Remove deprecated WITH_HOST_DALVIK."android-l-preview_r2l-previewIan Rogers
2014-06-11Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: I52f9f7d745f92ec3c5f0d3cb2eda6d2d12a73d27
2013-11-25am db971290: Merge "Remove use of LOCAL_BUILD_HOST_DEX"Narayan Kamath
* commit 'db97129042e7baaab6eda49138d9328f1217aaca': Remove use of LOCAL_BUILD_HOST_DEX
2013-11-25Merge "Remove use of LOCAL_BUILD_HOST_DEX"idea133-weekly-releaseidea133Narayan Kamath
2013-11-25Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath
(cherry picked from commit 5b16ab4c0186b6478df4a7f0c8f5c23a9e6c5f99) Change-Id: I7b44009bc878a5b9e65380dae7ad1893608a67ac
2013-11-07Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath
Change-Id: I650527fb0b95a71f8d33bb2bfbb165cbf89c783b
2013-09-10am a396af51: am 4bdf0c11: Merge "Do not initialize SSLSocketFactory too early"Kenny Root
* commit 'a396af51a908946a58d2b324cfe4a832cfff01cf': Do not initialize SSLSocketFactory too early
2013-09-10am 4bdf0c11: Merge "Do not initialize SSLSocketFactory too early"Kenny Root
* commit '4bdf0c11f7c6ec7e6310a579b40e7efd03baa94d': Do not initialize SSLSocketFactory too early