aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-12-08Refactor NetworkSecurityPolicy to be pluggableChad Brubaker
2015-12-02Merge "Fix HttpURLConnection.setFollowRedirects()" am: a74263de52Neil Fuller
2015-12-02Merge "Fix HttpURLConnection.setFollowRedirects()"Neil Fuller
2015-12-02Merge "Fix HttpURLConnection.setFollowRedirects()"Neil Fuller
2015-11-30Fix HttpURLConnection.setFollowRedirects()Neil Fuller
2015-11-16Merge "Fix URLConnectionTest.writeTimeouts with large receive buffers" am: a5...Neil Fuller
2015-11-16Merge "Fix URLConnectionTest.writeTimeouts with large receive buffers"Neil Fuller
2015-11-16Merge "Fix URLConnectionTest.writeTimeouts with large receive buffers"Neil Fuller
2015-11-10Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...Neil Fuller
2015-11-10Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devNeil Fuller
2015-11-10Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...Neil Fuller
2015-11-10Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r3android-cts-6.0_r2Neil Fuller
2015-11-09Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""Thierry Strudel
2015-11-09DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffersNeil Fuller
2015-11-09Fix URLConnectionTest.writeTimeouts with large receive buffersNeil Fuller
2015-11-05Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""Thierry Strudel
2015-11-04Merge "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" into mnc-d...Ye Wen
2015-11-04Merge "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" into mnc-d...Ye Wen
2015-11-04DO NOT MERGE Revert "okio: increase segment size to 8 KiB"Ye Wen
2015-10-27Merge "Fix visibility of test method that prevents tests running" am: 77cc4fcff2Neil Fuller
2015-10-27Merge "Fix visibility of test method that prevents tests running"Neil Fuller
2015-10-27Merge "Fix visibility of test method that prevents tests running"Neil Fuller
2015-10-27Fix visibility of test method that prevents tests runningNeil Fuller
2015-10-23Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()Neil Fuller
2015-10-23Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()marshmallow-mr1-devNeil Fuller
2015-10-23Merge "Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()"Neil Fuller
2015-10-23Merge "Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()"Neil Fuller
2015-10-23Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()Neil Fuller
2015-10-02resolved conflicts for 14053454 to mnc-dr-dev-plus-aospNeil Fuller
2015-10-01am e0d02d71: Reduce the memory requirements of a testmarshmallow-dr-devNeil Fuller
2015-09-30am d1c79b97: am 8912339b: Merge changes from topic \'okhttpupgrade_afterm\'Neil Fuller
2015-09-30am 8912339b: Merge changes from topic \'okhttpupgrade_afterm\'Neil Fuller
2015-09-30Reduce the memory requirements of a testNeil Fuller
2015-09-30Merge changes from topic 'okhttpupgrade_afterm'Neil Fuller
2015-09-23am 147e5ea7: okio: increase segment size to 8 KiBThierry Strudel
2015-09-22okio: increase segment size to 8 KiBThierry Strudel
2015-09-17Android modifications to OkHttpNeil Fuller
2015-09-17Pull latest code from upstream okhttp and okioNeil Fuller
2015-08-27am 93e6103c: (-s ours) am ff23ada4: am 04ebb4d1: am b60e2bef: (-s ours) am 99...Neil Fuller
2015-08-27am 96c2ae2d: (-s ours) am 79969219: am fe5cf4e1: am 6e829118: (-s ours) am ce...Neil Fuller
2015-08-27am 20e0e655: (-s ours) am dd172a12: Allow HttpEngine to retry connections on ...Narayan Kamath
2015-08-27am 1c4b431d: (-s ours) am bad0a111: Merge "Allow HttpEngine to retry connecti...Narayan Kamath
2015-08-12am ff23ada4: am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "...Neil Fuller
2015-08-12am ff23ada4: am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "...Neil Fuller
2015-08-12am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add f...android-cts-6.0_r1marshmallow-devNeil Fuller
2015-08-12am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add further handli...Neil Fuller
2015-08-12am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT i...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_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_r10lollipop-mr1-cts-releaselollipop-mr1-cts-devNeil Fuller
2015-08-12Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly re...Neil Fuller
2015-08-10Revert "Revert "Add further handling for when a CONNECT incorrectly returns a...Neil Fuller
2015-08-07am 79969219: am fe5cf4e1: am 6e829118: (-s ours) am ce55fb3f: Merge "Revert "...Neil Fuller