summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-14Convert external/mockwebserver to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I1392df4cdab64789b6b174df9a06a3e76e0f37e5
2018-02-20Snap for 4612226 from e441903a5f40ab00a49d76f5e9570a04ea80f74e to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I9154b61a0ce144a4ea63badda39ebf0b0e7342df
2018-02-19Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5 am: ↵android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devJiyong Park
6b5ff527e5 am: 67bf89d8c6 Change-Id: I06315e5155f7b0be8513faea25447c6338f027ea
2018-02-19Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5Jiyong Park
am: 6b5ff527e5 Change-Id: I0bfdbf8751cf783055d1c2fd6859a888410b4ea8
2018-02-19Merge "Reland "Build mockwebserver with core_current""Jiyong Park
am: 5ea6d395c5 Change-Id: Id6d0268cdf4842e9b670047f34c9e2ebe7b7b27e
2018-02-19Merge "Reland "Build mockwebserver with core_current""android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-02-15Snap for 4605948 from cc5bac0a575f83246ab4b2696f19497f63d90f00 to pi-releaseandroid-build-team Robot
Change-Id: I00ef9201b833100e60d30dfd30803a57c5a6cff7
2018-02-14Reland "Build mockwebserver with core_current"Jiyong Park
core_current is a set of Android SDK having core Java APIs only. This fixes the link-type check warning when this lib is used from an app built with SDK. Bug: 69899800 Test: m -j mockwebserver is succecssful Test: m -j CtsVerifier does not show link-type warning on this Test: master-art builds Change-Id: I87d312fc5d104af76ab30fda7587b8559ac9d4d1
2018-02-14Merge "Revert "Build mockwebserver with core_current"" am: 7c05da77a1 am: ↵Nicolas Geoffray
21e85cb4dd am: 9c1fa866c6 Change-Id: Iacbc5f6a29c9a22691be3b63579617b03ccaff2d
2018-02-14Merge "Revert "Build mockwebserver with core_current"" am: 7c05da77a1Nicolas Geoffray
am: 21e85cb4dd Change-Id: Ic1ee8922daa66dde68728bbf950bd8045eb2ac06
2018-02-14Merge "Build mockwebserver with core_current" am: 137de20af4 am: 3a51223f17Jiyong Park
am: fa514a8f3d Change-Id: I1668137ec7e00b15898db9e962655e2958b326b4
2018-02-14Merge "Build mockwebserver with core_current" am: 137de20af4Jiyong Park
am: 3a51223f17 Change-Id: Id3ecb075c8076933edd5bd4222f6a501ef113047
2018-02-14Merge "Revert "Build mockwebserver with core_current""Nicolas Geoffray
am: 7c05da77a1 Change-Id: Icf1e64978af28ee93bd702a7f9f5192b5e609290
2018-02-14Merge "Revert "Build mockwebserver with core_current""Nicolas Geoffray
2018-02-14Merge "Build mockwebserver with core_current"Jiyong Park
am: 137de20af4 Change-Id: Ifd64702ea40179bd134110f338fe3e4fb6b42ac0
2018-02-14Revert "Build mockwebserver with core_current"Jiyong Park
This reverts commit 9de3b641cb4402b4ff563ca1d730fd9ba0a1d655. Reason for revert: broke master-art branch Change-Id: I10285f251ddfe4c0836fb01fed5f3e104fb28ef1
2018-02-14Merge "Build mockwebserver with core_current"Treehugger Robot
2018-02-14Build mockwebserver with core_currentJiyong Park
core_current is a set of Android SDK having core Java APIs only. This fixes the link-type check warning when this lib is used from an app built with SDK. Bug: 69899800 Test: m -j mockwebserver is succecssful Test: m -j CtsVerifier does not show link-type warning on this Change-Id: Ibf8c28787445a9aa59fb5f55d075801f3dcd69a3
2016-06-29Merge \\\\"Initialize MockWebServer in setUp() not construction time\\\\" ↵android-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-preview-6android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-mr1-iot-preview-6Neil Fuller
am: f3c312b25a am: aa66709b3b am: 7057017d19 am: d680f43b99 Change-Id: I73305b91a6cf63b244b5a8f3e0d14c5ec416a017
2016-06-29Merge \\\"Initialize MockWebServer in setUp() not construction time\\\" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewo-iot-preview-5n-iot-preview-4Neil Fuller
f3c312b25a am: aa66709b3b am: 7057017d19 Change-Id: I867c7c9b9de0913199f0787dfcbb044d82295322
2016-06-29Merge \\"Initialize MockWebServer in setUp() not construction time\\" am: ↵Neil Fuller
f3c312b25a am: aa66709b3b Change-Id: I641c85f0874ac84f1ebd3ea3cc2750e95095b8ef
2016-06-29Merge \"Initialize MockWebServer in setUp() not construction time\"android-n-mr1-preview-2android-n-mr1-preview-1Neil Fuller
am: f3c312b25a Change-Id: Ib0e8b7a5422a85e4ce93917e292c1b6108c03c34
2016-06-29Merge "Initialize MockWebServer in setUp() not construction time"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Neil Fuller
2016-06-28Initialize MockWebServer in setUp() not construction timeNeil Fuller
Should be a no-op but makes test suite creation cheaper. Bug: 29820565 Change-Id: I481e2cf3864bb3632779b41e80e0c1032f897ee2
2015-12-24Merge "Add core-oj to the list of core library jars."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-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_r1nougat-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-dr1-releasenougat-devNarayan Kamath
am: 7de829dfae * commit '7de829dfae22e9be8aa973a721d59c48d7f6fe7d': Add core-oj to the list of core library jars.
2015-12-24Merge "Add core-oj to the list of core library jars."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1Narayan Kamath
2015-12-22Add core-oj to the list of core library jars.Piotr Jastrzebski
(cherry picked from commit 4a373829b099ba8aab9c4b88c25cd0391b5051dc) Change-Id: If53e3a22a7be03a7c51137d62f9511db0c1f4401
2015-11-23Add core-oj to the list of core library jars.Piotr Jastrzebski
Change-Id: Ie94b2db80b981080b9fada1f0e604edc458de4c3
2014-10-29am 7f9280b5: Merge "Add throttling support to MockWebServer"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-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-releaseNeil Fuller
* commit '7f9280b5b6ff3532ef27d4f938aa2e6bbc895473': Add throttling support to MockWebServer
2014-10-27am d5e25502: Add throttling support to MockWebServerNeil Fuller
* commit 'd5e25502a3ed333011753d5f2e1484072a7f5617': Add throttling support to MockWebServer
2014-10-27Add throttling support to MockWebServerandroid-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-releaseNeil Fuller
This adds non-blocking throttling support to MockWebServer. Most of the changes are patched across from OkHttp's version (minus SPDY changes). The motivation is to make an upstream OkHttp change easier to apply, but having fewer differences with the OkHttp version should be beneficial. Bug: 18083851 (cherry picked from commit d8f241c21b3e2e8f94648040b1b62d7b12491d4d) Change-Id: I7e23675cf0366028392e87c851b30e7d6dddb989
2014-10-27Merge "Add throttling support to MockWebServer"android-wear-5.0.0_r1lollipop-wear-releaseNeil Fuller
2014-10-24Add throttling support to MockWebServerNeil Fuller
This adds non-blocking throttling support to MockWebServer. Most of the changes are patched across from OkHttp's version (minus SPDY changes). The motivation is to make an upstream OkHttp change easier to apply, but having fewer differences with the OkHttp version should be beneficial. Bug: 18083851 Change-Id: I63367baa46897d02ca5d3fa86f3ab83712b8addf
2014-10-07Merge "mockwebserver-host is a dalvik static library"android-l-preview_r2l-previewYohann Roussel
2014-10-07mockwebserver-host is a dalvik static libraryYohann Roussel
Change-Id: I797608b4a1870d9ccfa6502bbed4d039ed371875
2014-06-19Merge "Switch from core to core-libart"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-releaseBrian Carlstrom
2014-06-18Switch from core to core-libartBrian Carlstrom
Bug: 14298175 Change-Id: I5e491bbebeffda594f233b0c21b8096070ca0f3c
2014-06-10Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
2014-06-08Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: I83d0da0e28af956339ea3a6c22ba2bd1b68ff200
2014-05-29Merge "Add the ability to set the number of worker threads"Neil Fuller
2014-05-28Add the ability to set the number of worker threadsNeil Fuller
There is a long comment in MockWebServer detailing the reason. This is to fix a flaky test that was issuing two requests in quick succession and getting unexpected results. Change-Id: I9af3f7f83fafc72002d874dd251fdf5a1df5d487
2014-02-19Merge "Adding additional SSL fields to RecordedRequest."idea133-weekly-releaseNeil Fuller
2014-02-19Adding additional SSL fields to RecordedRequest.Neil Fuller
Change-Id: I0af908d04cc5ca0a7c2ddc1d3b7f1e0a8b28548a
2013-08-21am e44762f7: Add new socket mode DISCONNECT_AFTER_READING_REQUESTidea133Narayan Kamath
* commit 'e44762f71ed6eeb718a0bb6f3848beb7696fd97d': Add new socket mode DISCONNECT_AFTER_READING_REQUEST
2013-08-21Add new socket mode DISCONNECT_AFTER_READING_REQUESTandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devNarayan Kamath
Useful for writing tests related to POST requests with retryable and unretryable bodies. (cherry picked from 3088bcc1d22f3e163e5e7ecbc997daadfdaaeec3) bug: 10211309 Change-Id: Icb042d5875c4651348103be4eed7a2e248449b52
2013-08-21am cb8ab9cb: Add bookkeeping requests to the request queue.Narayan Kamath
* commit 'cb8ab9cb9f5da083e7390920f0f7d0c8a879cb6b': Add bookkeeping requests to the request queue.
2013-08-21Merge "Add new socket mode DISCONNECT_AFTER_READING_REQUEST"tools_r22.2Narayan Kamath
2013-08-21Add new socket mode DISCONNECT_AFTER_READING_REQUESTNarayan Kamath
Useful for writing tests related to POST requests with retryable and unretryable bodies. Change-Id: Icb042d5875c4651348103be4eed7a2e248449b52
2013-08-21Add bookkeeping requests to the request queue.Narayan Kamath
We'd never add requests which corresponded to DISCONNECT_AT_START and FAIL_HANDSHAKE to the list of received requests. This allows tests to determine whether fallback requests were made or not. While we're here, tidy up RecordedRequest#toString. It would return "null" for bookkeeping requests and produce test outputs like "expected <null> but was null". Fixes CTS test URLConnectionTest#testSslFallback (cherry picked from a4a53d9c9bf86165a5e2bd9ce4bcb834f09d) bug: 10211309 Change-Id: I2ee1b523faf5c1b3387f5ca9f9ad19c0877e1ad5
2013-08-21Merge "Add bookkeeping requests to the request queue."Narayan Kamath
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 11:14:12 +0000