aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android-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_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 9e2e1441d3 -s ours am skip reason: subject contains skip directive Change-Id: Ibf0513d920750c9536aef1b71841bf2386be0de6
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I546f31690b4aa9b20be45e04d35d757294666365
2019-01-11Add default code reviewers into OWNERS am: 9455ffae9d am: 4f3e711b44Chih-Hung Hsieh
am: ad1f27db5c Change-Id: I9374a8ac12d502ad02d8ff3da8b68ebad78a22dd
2019-01-11Add default code reviewers into OWNERS am: 9455ffae9dChih-Hung Hsieh
am: 4f3e711b44 Change-Id: Ie42492e39deab7970d17e23bbd3c50901ec9f2ad
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
am: 9455ffae9d Change-Id: Ib07a14bb1fdfcaf84e013267113ab91b86d262c0
2019-01-10Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Iaa325f76b357b165b7a5ccf945dcfc2ebdca7a2c
2018-09-25Compile against core public SDK APIs only am: f78c7816cd am: d4c2ffb2d9Neil Fuller
am: 1ca4444fe1 Change-Id: Ib0e8c38a8931ea93aa36aeefa2876cfacad1f3be
2018-09-25Compile against core public SDK APIs only am: f78c7816cdNeil Fuller
am: d4c2ffb2d9 Change-Id: I7a0c845344a0f5ab32fbf7b7f902b5cc1baf9ccd
2018-09-25Compile against core public SDK APIs onlyandroid-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.7Neil Fuller
am: f78c7816cd Change-Id: Iae74a12537287c70b84e20ca2c8bbee9f4d32964
2018-09-25Compile against core public SDK APIs onlyandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseNeil Fuller
Explicitly compile using core_current, which are the public SDK APIs provided by the core libraries. Bug: 113148576 Test: build / treehugger Change-Id: I9412425e2aec33dd7a6d23ab18362e7f22234efa
2018-09-11Add METADATA for JUnitParams am: 02588d3537 am: 5d54d9630eHaibo Huang
am: a6f68b357b Change-Id: I5b07e66d2f720a81ad4e1db1ac7210721740c921
2018-09-11Add METADATA for JUnitParams am: 02588d3537Haibo Huang
am: 5d54d9630e Change-Id: I2c1a4253eabffb2a153111aa2b0ec9a41193adc6
2018-09-11Add METADATA for JUnitParamsHaibo Huang
am: 02588d3537 Change-Id: I1940ca01b48fd9dc801b44d2a6bf8a616b2a5139
2018-09-11Add METADATA for JUnitParamsHaibo Huang
Test: NA Change-Id: I05b1a26b30bb706475e6d4ed591dbe7d62f6ab85
2018-04-10Convert junit-params to Android.bp am: 98cf2d7346 am: c4399cb902Colin Cross
am: d893a996dd Change-Id: Ied7be411dc6410bbbe5d6a645ba4dd25acfb9f16
2018-04-10Convert junit-params to Android.bp am: 98cf2d7346android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Colin Cross
am: c4399cb902 Change-Id: Iafe96c94c20213fb14a91fbab0a703b15f7761a7
2018-04-10Convert junit-params to Android.bpColin Cross
am: 98cf2d7346 Change-Id: I936f80fc795b7e001c2b1114d62c188a2f8f0401
2018-04-09Convert junit-params to Android.bpandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-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-8o-mr1-iot-preview-8Colin Cross
See build/soong/README.md for more information. Bug: 70770641 Test: m checkbuild Test: vogar --classpath \ ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/junit-params-test_intermediates/javalib.jar \ junitparams Change-Id: Ib342a7625c0e06784942a0227c82268abbaaa5e1
2017-06-09Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 ↵android-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-wear-8.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-p-preview-1android-o-mr1-iot-preview-7android-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_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_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-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-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-mr1-devo-mr1-iot-preview-7Paul Duffin
am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91" into oc-dr1-dev-plus-aosp am: 1eda771728 Change-Id: I44551434bc0c9197b106770c761ff4026fedbf26
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: ad285d8a17 am: 72bb3341d9 Change-Id: I7ed286fa9a95f0b757f57b96dc552c13ee6bc56f
2017-06-09Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Android Build Merger (Role)
am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91" into oc-dr1-dev-plus-aosp
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91 Change-Id: I7e0837f5b98260b4fde44ee4dfca9a971e40964c
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: ad285d8a17 Change-Id: I8796c14dd51c0e0774638a3199f2f352107e60fd
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵oreo-dr1-devPaul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 Change-Id: Idb87e45cee9a8a984457da776a97ab4e17e6fa34
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵android-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 Change-Id: I342667526228eff6b871ee33baa94b71d8cc420d
2017-06-09Merge "Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987" into oc-dr1-dev-plus-aosp am: 2594f7b833 Change-Id: I04079a7aa28e655ced5074ca452a1feca724b385
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: e0269077c5 am: b83c1c74b5 Change-Id: Ia414efebd04570f3cac7f8a056129d4f8a75dab4
2017-06-09Merge "Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Android Build Merger (Role)
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987" into oc-dr1-dev-plus-aosp
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: e0269077c5 Change-Id: Ie22f4286f4bac234f176b1546852fbd1a5ee77bc
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987 Change-Id: I4870acbadbae554b9e6fdc8e3e6e719c975e281a
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours Change-Id: I5b0212871aa8febc4551e0808509b3ce3654a2f3
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours Change-Id: I6a12f8ac2dded936997d51e0e57fcba8832cda6f
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 Bug:38419944 Change-Id: Idb0cf19a4fb6d7e9b6161a708c8c582f4393fdc4 (cherry picked from commit bf41e5d5462598381b2fe3ce7e0d5303450a4ca6)
2017-06-08Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: 5a47920cc4Paul Duffin
am: a4bb7ac645 Bug:38419944 Change-Id: If74ffd92284a9254fb8f0df776bf88b36b386558 (cherry picked from commit 20b7a9576f4fdddc13b32e159fb31852d2f50f97)
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 Change-Id: Idb0cf19a4fb6d7e9b6161a708c8c582f4393fdc4
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e Change-Id: I63c6e87ba97733c1b233e4283c86b4d1180686c9
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325Paul Duffin
am: 2f41cd20c0 Change-Id: Idcf24600dea537fa1cfe3eb925d3ff82a586453f
2017-05-26Fix JUnitParamsRunner so it works with CTS shardingPaul Duffin
am: b03560c325 Change-Id: I755190fc7c11a89ff1a26b639e43d718ba4d6373
2017-05-26Fix JUnitParamsRunner so it works with CTS shardingandroid-o-preview-4android-o-preview-3android-o-iot-preview-5o-iot-preview-5Paul Duffin
CTS uses the Android Test Support Library's TestRequestBuilder.ShardingFilter to spread changes across a number of devices in order to parallelize testing. CTS runs the tests in two modes, in the first it collects the set of tests that will be run - the list of tests returned by Runner.getDescription() (after filtering) and in the second it actually runs the tests as returned by ParentRunner.getFilteredChildren(). JUnitParams does not work in that situation because it applies the filter in a different way for parameterized methods depending on whether it is collecting or running which leads to inconsistent methods in each phase which causes CTS problems. When collecting it creates a flat list of FrameworkMethod instances, one for each method, whether parameterized or not and applies the filter to that. Once it has filtered it iterates over to create the Description and during that process it creates N Description objects for each parameterized method and 1 Description object for each non-parameterized method. That means that for each parameterized method either every instance is collected or none of them are. When running it creates a flat list of FrameworkMethod instances, one for each non-parameterized method and N for each parameterized method (where N is the number of parameter sets supplied for the method). They are then filtered individually. That means that for each parameterized method some of its instances are run but not necessarily all. This fixes it by making the running and describing parts completely consistent in how they apply the filters. This change will be pushed upstream if possible. Tested by running the two commands given in the bug and ensuring that they produce the correct set of tests. Added target to build the test on host and ran selected tests from there. Ran all tests on the device as per instructions in Android.mk file. Bug: 38419944 Test: See above Change-Id: I25b4d4130ffdc71c77992abf592662ba1e1432db
2017-05-26Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: 5a47920cc4Paul Duffin
am: a4bb7ac645 Change-Id: If74ffd92284a9254fb8f0df776bf88b36b386558
2017-05-26Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10Paul Duffin
am: 5a47920cc4 Change-Id: I46f89b6c7c199b48a1c8f9eadd5221fe783f4075
2017-05-26Ignore tests that no longer work am: 2a75dcb2fdPaul Duffin
am: f3cfecad10 Change-Id: Ie9a463a530cb6282ff928698a5c420e9ea31d937
2017-05-26Ignore tests that no longer workPaul Duffin
am: 2a75dcb2fd Change-Id: Ie1b660f401e9ea9c301b11ad8976dbd25b737c8c
2017-05-25Ignore tests that no longer workPaul Duffin
Previous changes caused tests that use @TestCaseName to start to fail but did not update the tests to ensure that they still run. Bug: 38419944 Test: run tests as described in Android.mk Change-Id: I2d5ed10bcf49fa114f73292bbe06fd70c158ae99
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTS am: ↵Paul Duffin
ab5f9f1d78 am: 67e1cb1101 am: 2ce40971d6 Change-Id: Ib8a42ab6f8d107b9b337219174e84e9cb9db12a9
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTS am: ab5f9f1d78Paul Duffin
am: 67e1cb1101 Change-Id: Id51ba0ddae726eb1395353b64738f914aa56f71f
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTSandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Paul Duffin
am: ab5f9f1d78 Change-Id: I9ffd6f4c59eee40bd1da192efc803179cd13c8bc
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTSPaul Duffin
AndroidJUnitRunner and CTS require test names to be a specific format. The default JUnitParams format is not suitable. This change forces it to one that is suitable and prevents it from being overridden using the @TestCaseName annotation. These are a sample of parameterized and unparameterized test names. The latter two are from a JUnitParamsRunner based test. libcore.java.net.FtpURLConnectionTest#testOutputUrl pass libcore.java.net.IDNTest#test_toUnicode_failures pass libcore.java.net.InetAddressTest#test_getByName_invalid[0] pass libcore.java.net.InetAddressTest#test_getByName_invalid[1] pass Bug: 36074730 Bug: 36541809 Test: run cts -m CtsLibcoreTestCases and check test names of parameterized tests, e.g. those from libcore.java.net.InetAddressTest Change-Id: Id9a8f8ce9affeb85fb2f410d11e764e99d7287b3
2017-03-22Make sure that filters affect the Description am: 99fe7c3891 am: 6c3f4570e0Paul Duffin
am: 63dd96c6f8 Change-Id: Ia2a7e2ab316c022e19b52ab4fc54ca00490cbf79
2017-03-22Make sure that filters affect the Description am: 99fe7c3891Paul Duffin
am: 6c3f4570e0 Change-Id: I518a1c3cebf52ba7b46044b61a6aca43235a6ac2