summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/http
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
| | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-1219-5626/+2
| | | | | | | | | | | | | | | | | | | We continue to compile external/apache-http into ext.jar. This contains a few changes apart fom the classes moving around : - Makefile changes to build docs and api-stubs for now. A future change will revert these changes and remove these classes from stubs and docs. - Hardcode event IDs in legacyerrorstrings to avoid a dependency between the frameworks and apache. These strings are on their way out and will never change anyway. - Remove imports due to {@link} tags and use {@code} instead. - Remove an accidental(?) dependency on apache commons code that's a part of apache-http. bug: 18027885 Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
* am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
|\ | | | | | | | | * commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e': Fix for broken docs build.
| * Fix for broken docs build.Neil Fuller2015-01-201-9/+10
| | | | | | | | | | | | Broken by commit 50a01d89606b40dd151ad407d05c3b2867bbdbad Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
* | resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aospNeil Fuller2015-01-201-32/+41
|\ \ | |/ | | | | Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
| * Changes associated with an OkHttp upgradeNeil Fuller2015-01-201-32/+41
| | | | | | | | Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
* | am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."Narayan Kamath2014-11-272-100/+56
|\ \ | |/ | | | | | | * commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1': Stop using ErrorStrings for apache.
| * Stop using ErrorStrings for apache.Narayan Kamath2014-11-272-100/+56
| | | | | | | | | | | | | | | | | | | | These strings only ever end up in logcat (at best), so there's no point having them translated. Also, rename the ErrorStrings class and move it android.webkit where the last remaining caller lives. (congrats webview people, this is now your mess to maintain.) Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
* | am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" ↵Narayan Kamath2014-11-273-94/+57
|\ \ | |/ | | | | | | | | | | class." * commit 'bedb13782a6beb5f15621915a7b68439c6649ced': Delete general sounding "CharArrayBuffers" class.
| * Delete general sounding "CharArrayBuffers" class.Narayan Kamath2014-11-273-94/+57
| | | | | | | | | | | | | | Move the code to the only point of use. Preparatory work for decoupling apache-http from the frameworks. Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
* | am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http."Narayan Kamath2014-11-271-41/+0
|\ \ | |/ | | | | | | * commit 'f0c22b0c72c8fbd5ce507419adda0670871a07bf': Delete unused class from android.net.http.
| * Delete unused class from android.net.http.Narayan Kamath2014-11-271-41/+0
| | | | | | | | | | | | | | Foundation for moving a lot of these classes out of the frameworks and @removing these APIs. Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
* | am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-1/+1
|\ \ | |/ | | | | | | * commit 'd00ced983ee235f72a9261fd967309a2638dde05': Track change to Conscrypt
| * am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-1/+1
| |\ | | | | | | | | | | | | * commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1': Track change to Conscrypt
| | * Track change to ConscryptKenny Root2014-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Change way in which an outside caller can get the preferred SSLContext. Bug: 17136008 Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
| | * RemoveBrian Carlstrom2014-07-074-165/+23
| | | | | | | | | | | | | | | | | | (cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e) Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
* | | Deprecate more apache-http.Narayan Kamath2014-10-231-0/+18
|/ / | | | | | | | | | | bug: 18067888 Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
* | RemoveBrian Carlstrom2014-07-074-165/+23
| | | | | | | | Change-Id: Ia2fa4ebae090838c2bf7bc96edc38a85fe3059dd
* | am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for ↵Brian Carlstrom2014-03-311-1/+2
|\ \ | |/ | | | | | | | | | | X509TrustManagerExtensions argument validation" * commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1': Improve detail message for X509TrustManagerExtensions argument validation
| * Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
| | | | | | | | | | Bug: 13728564 Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
* | am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: ↵Kenny Root2014-03-271-1/+10
|\ \ | |/ | | | | | | | | | | initialize TrustManagerFactory" * commit '1dc1d6b22deb38d78960f3ce89f94e536610492e': CertificateChainValidator: initialize TrustManagerFactory
| * CertificateChainValidator: initialize TrustManagerFactoryKenny Root2014-03-261-1/+10
| | | | | | | | | | | | | | Need to call TrustManagerFactory#init before use. I suspect this class isn't used anywhere since this hasn't caused a problem yet. Change-Id: I17425d0bba4795d71960062361a755830abba7de
* | am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use ↵Kenny Root2014-03-254-34/+387
|\ \ | |/ | | | | | | | | | | X509ExtendedTrustManager and not Conscrypt" * commit '266de3efcd4b57ba3b301d87ff0fb692090d9a95': Use X509ExtendedTrustManager and not Conscrypt
| * Use X509ExtendedTrustManager and not ConscryptKenny Root2014-03-244-34/+387
| | | | | | | | | | | | | | | | This allows the new X509ExtendedTrustManager to be used instead of Conscrypt directly. Bug: 13103812 Change-Id: I736f475342395f26657f2371828a6d3a0065a50a
* | am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the ↵Alex Klyubin2014-03-241-2/+2
|\ \ | |/ | | | | | | | | | | change in the private SSLParameterImpl API." * commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3': Adjust to the change in the private SSLParameterImpl API.
| * Adjust to the change in the private SSLParameterImpl API.Alex Klyubin2014-03-211-2/+2
| | | | | | | | | | | | | | | | Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to getDefaultX509TrustManager. Bug: 13563574 Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
* | Merge "Expose new API for querying whether a certificate was user added."William Luh2013-12-111-0/+14
|\ \
| * | Expose new API for querying whether a certificate was user added.William Luh2013-11-191-0/+14
| | | | | | | | | | | | | | | Bug: 11257762 Change-Id: I0087048189f71b76761e7e95f98261c02bf73967
* | | Remove unused imports from frameworks/base.John Spurlock2013-11-208-21/+0
|/ / | | | | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* | Revert "Expose new API for querying whether a certificate was user added."William Luh2013-11-191-13/+0
| | | | | | | | | | | | This reverts commit 60b96502b39d221afb43ff7e8a49a19a2fb3c2e0. Change-Id: Ie1c2ee4c983c4d6b0c086f252a191b3c60e50b9c
* | Expose new API for querying whether a certificate was user added.William Luh2013-11-121-0/+13
|/ | | | | Bug: 11257762 Change-Id: Icb23ac4f452528751988db708f7588ef45d23c26
* If frameworks wants ASCII casing, it should explicity ask for it.Elliott Hughes2013-08-022-3/+6
| | | | | | | http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html Bug: https://code.google.com/p/android/issues/detail?id=58359 Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
* am 15cb526e: Merge "Fix import after okhttp update."Elliott Hughes2013-07-181-1/+1
|\ | | | | | | | | * commit '15cb526ece1420b1ae2061e20fd0982d82b41aae': Fix import after okhttp update.
| * Fix import after okhttp update.Narayan Kamath2013-07-181-1/+1
| | | | | | | | | | | | | | OkResponseCache moved packages in change 62321. Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
* | am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."Narayan Kamath2013-06-131-39/+30
|\ \ | |/ | | | | | | * commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf': Update HttpResponseCache to use the new cache API.
| * Update HttpResponseCache to use the new cache API.Narayan Kamath2013-06-121-39/+30
| | | | | | | | | | | | | | | | The new API was introduced in https://android-review.googlesource.com/#/c/59985/ Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
* | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-293-6/+6
|\ \ | |/ | | | | Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
| * Track change to JSSE providerKenny Root2013-04-293-6/+6
| | | | | | | | Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
* | am d152f7ec: Merge "Don\'t use X509CertImpl directly"Kenny Root2013-04-291-3/+10
|\ \ | |/ | | | | | | * commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913': Don't use X509CertImpl directly
| * Don't use X509CertImpl directlyKenny Root2013-04-291-3/+10
| | | | | | | | Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
* | am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-031-7/+8
|\ \ | |/ | | | | | | * commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892': Adjust the HttpResponseCache for OkHttp.
| * Adjust the HttpResponseCache for OkHttp.jwilson2013-04-031-7/+8
| | | | | | | | Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
* | am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes ↵Brian Carlstrom2013-01-041-13/+28
|\ \ | |/ | | | | | | | | | | for distinguished name display" * commit '498eaf58ad399e42cf7b3aca020b828c35023288': Use most specific attributes for distinguished name display
| * Use most specific attributes for distinguished name displayBrian Carlstrom2013-01-041-13/+28
| | | | | | | | | | | | Bug: 7894348 Bug: http://code.google.com/p/android/issues/detail?id=41662 Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
* | am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."Elliott Hughes2012-11-291-2/+1
|\ \ | |/ | | | | | | * commit '878da6532836ec09f6d27e8f5af79444c79e78b6': Fix AndroidHttpClient documentation error.
| * Fix AndroidHttpClient documentation error.Elliott Hughes2012-11-291-2/+1
| | | | | | | | | | | | | | AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes. Bug: http://code.google.com/p/android/issues/detail?id=37294 Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
* | Add method name to curl outputMaurice Chu2012-11-141-15/+21
|/ | | | | | | | Backporting change made to AndroidHttpClient.java from CL I0f3819e84542023fca65ec4a29534ef32e877570. Bug: 7499444 Change-Id: Ie67d2917fa378afb00ec4bd7c3de238f48f7c6af
* am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
|\ | | | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| * Correct executable bit for source filesKenny Root2012-11-071-0/+0
| | | | | | | | | | | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
* | Reverting public setSoWriteTimeoutBrian Carlstrom2012-09-261-17/+16
| | | | | | | | | | | | | | | | This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86 Bug: 7237764 Bug: 6693087 Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
generated by cgit v1.1 at 2025-08-16 01:53:49 +0000