summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2013-08-20Add 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 Change-Id: I2ee1b523faf5c1b3387f5ca9f9ad19c0877e1ad5
2013-05-06Merge "Do not allow MockWebServer to be played more than once"tools_r22jb-mr1.1-dev-plus-aospBrian Carlstrom
2013-05-06Do not allow MockWebServer to be played more than onceBrian Carlstrom
Change-Id: Ib525b71e6addec7cd83a8cde065f958b04024933
2013-04-03Merge "Track upstream changes to mockwebserver."Brian Carlstrom
2013-04-03Track upstream changes to mockwebserver.jwilson
This removes the MockStreamResponse class, replacing it with the previous MockResponse class. The MockStreamResponse class added too much to the MockWebServer API for too little benefit: the BaseResponse class wasn't 'public' but it was required to be public API for callers to call MockWebServer.enqueue(). This approach is less object-oriented, but also a lot smaller. Change-Id: I8496fc3c4dcbfaaf6cd5e97f06d2786b49fa51e1
2013-04-02Merge "mockwebserver only needs to depend on core.jar"Brian Carlstrom
2013-04-02mockwebserver only needs to depend on core.jarBrian Carlstrom
Change-Id: I0b6ec193ff35b25b102f3f9287a951bdc77bd7c4
2013-03-25Merge "Add BaseMockResponse with two flavors."android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devJeff Sharkey
2013-03-25Add BaseMockResponse with two flavors.Jeff Sharkey
Some tests rely on MockResponses being cloned as they're enqueued, which doesn't mix well with the recent switch to using InputStream to represent all bodies. This change introduces a base class that handles common header management, and two distinct flavors: MockResponse which returns to using byte[] bodies, and MockStreamResponse which is InputStream based. MockResponse are again cloned when enqueued, making existing tests happy. Bug: 8334369 Change-Id: I12b83a06d17ba82d46166c5550397a2198ce68fd
2013-02-25Merge "Let tests provide raw InputStream bodies."Jeff Sharkey
2013-02-22Let tests provide raw InputStream bodies.Jeff Sharkey
This enables testing of large files, such as those beyond the 2GB boundary. Also switches to streaming in MTU-sized chunks. Bug: 8209169 Change-Id: Iab6b299c13a3d67bbbaa80a9e5bc563ef6cf9302
2013-01-18Merge "Rename mockwebserver-hostdex to mockwebserver-host"jb-mr1-dev-plus-aospBrian Carlstrom
2013-01-17Rename mockwebserver-hostdex to mockwebserver-hostBrian Carlstrom
Change-Id: I0853a728ca8ff8a5ca43f15fc83656304bc822a1
2012-05-15Remove obsolete ThirdPartyProject.prop file.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devElliott Hughes
Change-Id: I8d9837325caa9679829ebaf0cb3feb9b8aa91766
2012-05-09Fix NPE in RecordedRequest Constructorandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-devBrian Muramatsu
Bug 6294000 MockWebServer passes null as the requestLine argument to RecordedRequest sometimes which causes a NPE. Fix RecordedRequest's constructor to allow for null method and path which is parsed from the requestLine argument. Change-Id: Ibbff001629cbc95b389bea3bebe5583a50a7223e
2012-03-29More header manipulation, limit bytes-per-second.Jeff Sharkey
Add setHeader() and removeHeader() that mutate matching MockResponse headers. Support "bytes-per-second" to throttle response rate. Split request line into components. Change-Id: I107baa3727ced2d7ddcc5e3cb983f5dc9341dabd
2011-12-19Support SSL handshake failures.Jesse Wilson
Also add an API to RecordedRequest to help differentiate between original TLSv1 requests and SSLv3 fallback requests. Bug: http://b/4462288 Change-Id: I31ad0e51ca4d21365e8f1d1e717f97cc94eb040e
2011-12-14Add an API to expose the server's cookie domain.Jesse Wilson
Bug: http://b/3041920 Change-Id: I5c8cce92d68a74a18a8b2ea0f75f6b48ab3601d5
2011-06-22Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseBrian Carlstrom
2011-06-07Add mockwebserver r9 to git in dalvik-dev.Jesse Wilson
Cherry-pick of I0bdf85b8066a5799aed92bd444b7681432874a59 Change-Id: If55d25f4dc93da6746e5230284d564600071caf8
2011-06-07Add mockwebserver r9 to git.Jesse Wilson
Change-Id: I0bdf85b8066a5799aed92bd444b7681432874a59
2011-05-31Initial empty repositoryAnatol Pomazau