summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: c54bde4bc9 am: 66cfa64792android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseNeil Fuller
am: 237c68a7b1 Change-Id: Id8a250e95cdd09dac45e24710ee0a43bac650da4
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: c54bde4bc9ndk-sysroot-r21Neil Fuller
am: 66cfa64792 Change-Id: I80fa785c93cbe3cdeefd0798f62dbc56a7db5ab7
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"Neil Fuller
am: c54bde4bc9 Change-Id: Ia9eaa68167e3e32ea28ebebc90a7abe10dea3d50
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"android-o-mr1-iot-release-1.0.14Neil Fuller
2019-07-03Fix include syntax on libcore/OWNERS fileNeil Fuller
The syntax requires the project to be specified as a prefix. Change-Id: I773b32d7b31c39248e035c6a1439044f46132e4d Exempt-From-Owner-Approval: Fixes OWNERS Test: None
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file" am: e6a5264a24 am: ↵Neil Fuller
d00342068f am: d8b0cc458a Change-Id: I8d0cf2516e4f8feee29293e0272c4a4beb65ac45
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file" am: e6a5264a24Neil Fuller
am: d00342068f Change-Id: I2842e84a607166feede2f0fccec3419efb31f9eb
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
am: e6a5264a24 Change-Id: If03fdab13d01af27f4d80250f75a98d6818c0ee4
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
Update OWNERS to reference libcore's OWNERS file Test: ls ../../libcore/OWNERS Change-Id: If50499d2792882794b1d0c84b62f3f29ef90edc8
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()." am: ↵Tobias Thierer
fde7df8250 am: 954e762c5c Change-Id: I71030801294b1484b9de91cfa83c27cb829b0524
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()."android-o-mr1-iot-release-1.0.13Tobias Thierer
am: fde7df8250 Change-Id: Ia371d32c9c7a4187c2d092cbb3c00896769ab790
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTobias Thierer
2019-04-08Let MockWebServer respect MockResponse.getBodyDelayTimeMs().Tobias Thierer
MockResponse has a field bodyDelayTimeMs to indicate a desired delay between the end of the headers being sent and the start of the response body being sent, but MockWebServer wasn't respecting it. This CL fixes that. Bug: 129771436 Test: URLConnectionTest on top of http://r.android.com/940893 Change-Id: I9cdc2f3fcbe22c90c5edbc5ed822f233d1120b11
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 399b47aa53 -s ours am skip reason: subject contains skip directive Change-Id: I46886c91c5d49a8778bc501fb5ff0dc5dc4c58eb
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If5b0482d71001934e6041ae046cc594f7c76fb1b
2019-01-10Merge "Add default code reviewers into OWNERS" am: 8b3f51d37e am: 44559fc738Chih-hung Hsieh
am: fa57fe70f6 Change-Id: I95ae158ed1fa177ed12f4b3199bba607a04b1b20
2019-01-10Merge "Add default code reviewers into OWNERS" am: 8b3f51d37eChih-hung Hsieh
am: 44559fc738 Change-Id: Idccc26fbb860e9fd81e2084890c1c3ae317644b2
2019-01-10Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 8b3f51d37e Change-Id: I882cd77fbab6798ca7e88c500bfb494f9c56a75c
2019-01-10Merge "Add default code reviewers into OWNERS"android-q-preview-1android-o-mr1-iot-release-1.0.10Chih-hung Hsieh
2019-01-10Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ie988ad0c1fe73884c5610dae565a0d7e4ff9a6e4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ecf7904261 -s ours am: b9420a29db -s ours am: f8cf051340 -s ours Change-Id: I3bd07d6a828910abb37721fab8f64a3e4ea20591
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ecf7904261 -s ours am: b9420a29db -s ours Change-Id: Ic106b0fd43f10db1c2744c09ea51ce47daae6485
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: ecf7904261 -s ours Change-Id: Ib519c1efb9adb9e59d384672e0eacf09fcf24c63
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I7057e8f465b24c83a289e907d26a0a19a34413fe
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: a84c462e51 -s ours am: 353aeec854 -s ours Change-Id: I9b1d53fcf7c69c3af7de868a0b71dc56470ef09d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: a84c462e51 -s ours Change-Id: I0acd32bfd6f3e4e15f74c5d8506c9ab86147efa1
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Id8c691dbcba1ef76add31992305ddcc4167e0d04
2018-08-16Merge "Convert external/mockwebserver to Android.bp" am: 2631e2ca26 am: ↵Colin Cross
434a7b234b am: afbe9c1882 Change-Id: Id2b8e41309944cf6e48c6ac161de382f35267ec8
2018-08-16Merge "Convert external/mockwebserver to Android.bp" am: 2631e2ca26Colin Cross
am: 434a7b234b Change-Id: I53e26a28670fcbf9adc0c4f2fc0310850c1d6d94
2018-08-16Merge "Convert external/mockwebserver to Android.bp"Colin Cross
am: 2631e2ca26 Change-Id: Iae401fd576e349f360a1fb9e22465227e4fc768b
2018-08-16Merge "Convert external/mockwebserver to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 07:43:55 +0000