summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/http
Commit message (Expand)AuthorAgeFilesLines
* Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
* Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-1219-5626/+2
* am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
|\
| * Fix for broken docs build.Neil Fuller2015-01-201-9/+10
* | resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aospNeil Fuller2015-01-201-32/+41
|\ \ | |/
| * Changes associated with an OkHttp upgradeNeil Fuller2015-01-201-32/+41
* | am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."Narayan Kamath2014-11-272-100/+56
|\ \ | |/
| * Stop using ErrorStrings for apache.Narayan Kamath2014-11-272-100/+56
* | am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" c...Narayan Kamath2014-11-273-94/+57
|\ \ | |/
| * Delete general sounding "CharArrayBuffers" class.Narayan Kamath2014-11-273-94/+57
* | am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http."Narayan Kamath2014-11-271-41/+0
|\ \ | |/
| * Delete unused class from android.net.http.Narayan Kamath2014-11-271-41/+0
* | am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-1/+1
|\ \ | |/
| * am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-1/+1
| |\
| | * Track change to ConscryptKenny Root2014-10-311-1/+1
| | * RemoveBrian Carlstrom2014-07-074-165/+23
* | | Deprecate more apache-http.Narayan Kamath2014-10-231-0/+18
|/ /
* | RemoveBrian Carlstrom2014-07-074-165/+23
* | am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509...Brian Carlstrom2014-03-311-1/+2
|\ \ | |/
| * Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
* | am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: init...Kenny Root2014-03-271-1/+10
|\ \ | |/
| * CertificateChainValidator: initialize TrustManagerFactoryKenny Root2014-03-261-1/+10
* | am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTr...Kenny Root2014-03-254-34/+387
|\ \ | |/
| * Use X509ExtendedTrustManager and not ConscryptKenny Root2014-03-244-34/+387
* | am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the chan...Alex Klyubin2014-03-241-2/+2
|\ \ | |/
| * Adjust to the change in the private SSLParameterImpl API.Alex Klyubin2014-03-211-2/+2
* | 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
* | | Remove unused imports from frameworks/base.John Spurlock2013-11-208-21/+0
|/ /
* | Revert "Expose new API for querying whether a certificate was user added."William Luh2013-11-191-13/+0
* | Expose new API for querying whether a certificate was user added.William Luh2013-11-121-0/+13
|/
* If frameworks wants ASCII casing, it should explicity ask for it.Elliott Hughes2013-08-022-3/+6
* am 15cb526e: Merge "Fix import after okhttp update."Elliott Hughes2013-07-181-1/+1
|\
| * Fix import after okhttp update.Narayan Kamath2013-07-181-1/+1
* | am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."Narayan Kamath2013-06-131-39/+30
|\ \ | |/
| * Update HttpResponseCache to use the new cache API.Narayan Kamath2013-06-121-39/+30
* | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-293-6/+6
|\ \ | |/
| * Track change to JSSE providerKenny Root2013-04-293-6/+6
* | am d152f7ec: Merge "Don\'t use X509CertImpl directly"Kenny Root2013-04-291-3/+10
|\ \ | |/
| * Don't use X509CertImpl directlyKenny Root2013-04-291-3/+10
* | am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-031-7/+8
|\ \ | |/
| * Adjust the HttpResponseCache for OkHttp.jwilson2013-04-031-7/+8
* | am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes fo...Brian Carlstrom2013-01-041-13/+28
|\ \ | |/
| * Use most specific attributes for distinguished name displayBrian Carlstrom2013-01-041-13/+28
* | am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."Elliott Hughes2012-11-291-2/+1
|\ \ | |/
| * Fix AndroidHttpClient documentation error.Elliott Hughes2012-11-291-2/+1
* | Add method name to curl outputMaurice Chu2012-11-141-15/+21
|/
* am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
|\
| * Correct executable bit for source filesKenny Root2012-11-071-0/+0
* | Reverting public setSoWriteTimeoutBrian Carlstrom2012-09-261-17/+16