summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-15Merge "Merge "Hide mouse pointer during SurfaceViewSyncTests." into ↵android-o-iot-preview-5o-iot-preview-5Android Merger
nougat-mr1-cts-dev am: b07b5561f8"
2017-08-15Merge "Hide mouse pointer during SurfaceViewSyncTests." into nougat-mr1-cts-devKazuhiro Inaba
am: b07b5561f8 Change-Id: I0f1bd26d6096a638467c86626134c6a00f667337
2017-08-15Merge "Hide mouse pointer during SurfaceViewSyncTests." into nougat-mr1-cts-devTreehugger Robot
2017-08-14Hide mouse pointer during SurfaceViewSyncTests.Kazuhiro Inaba
This CL changes the pointer icon for the test activity to an empty image. It makes sure that the pointer drawn over the tested rendering result won't interfere the test result. Bug: 62044128 Test: Connect and move mouse, and run android.view.cts.SurfaceViewSyncTests CTS Change-Id: Ic83a231b5cadd0734dfbfbf7d031618d11461c13
2017-08-11Merge "avoid using private APIs for PhoneNumberUtils cts"Chen Xu
2017-08-11avoid using private APIs for PhoneNumberUtils ctsfionaxu
Bug: 13250611 Test: run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest Change-Id: I9a05ab9e69104ba1fd28f02e1f4f90b89bd08db5
2017-08-10Merge "Merge "Merge "Persist test status to handle config interruptions" ↵Android Merger
into nougat-cts-dev am: 4cad58e58d" into nougat-mr1-cts-dev am: cf4353d4a4"
2017-08-10Merge "Merge "Persist test status to handle config interruptions" into ↵Darryl L Johnson
nougat-cts-dev am: 4cad58e58d" into nougat-mr1-cts-dev am: cf4353d4a4 Change-Id: I9675779f2ed20eec6c04e07246388586fe55d2ca
2017-08-10Merge "Merge "Persist test status to handle config interruptions" into ↵Android Merger
nougat-cts-dev am: 4cad58e58d" into nougat-mr1-cts-dev
2017-08-10Merge "Persist test status to handle config interruptions" into nougat-cts-devDarryl L Johnson
am: 4cad58e58d Change-Id: I8d8e20c8411d9ca069de4a4a922119a7cb0745d8
2017-08-10Merge "Persist test status to handle config interruptions" into nougat-cts-devTreehugger Robot
2017-08-09Merge "Track tinyxml2 API change."Elliott Hughes
2017-08-09Merge "Merge "Use minimum resolution of supported resolutions" into ↵Android Merger
nougat-mr1-cts-dev am: 00ff7b0046"
2017-08-09Merge "Use minimum resolution of supported resolutions" into nougat-mr1-cts-devTina Zhou
am: 00ff7b0046 Change-Id: I5df845cd3c67bdd2870a4e84553bea3fa8286ff3
2017-08-09Merge "Use minimum resolution of supported resolutions" into nougat-mr1-cts-devTina Zhou
2017-08-09Merge "Merge "Dup fds to stop finalizers from invalidating them." into ↵Android Merger
nougat-mr1-cts-dev am: 6805322551"
2017-08-09Merge "Dup fds to stop finalizers from invalidating them." into ↵Lorenzo Colitti
nougat-mr1-cts-dev am: 6805322551 Change-Id: Icc52afe2baab268e8acc362787b2e13aa0349485
2017-08-09Merge "Dup fds to stop finalizers from invalidating them." into ↵Treehugger Robot
nougat-mr1-cts-dev
2017-08-09Merge "Add lib/exec for dl.* tests from bionic"Treehugger Robot
2017-08-09Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" ↵Android Merger
into nougat-cts-dev am: 9348a31a0a -s ours" into nougat-mr1-cts-dev am: e322b7ab10 -s ours"
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" into ↵tinazh
nougat-cts-dev am: 9348a31a0a -s ours" into nougat-mr1-cts-dev am: e322b7ab10 -s ours Change-Id: I7669c47ebbaf8e30a9fa39d72e2752b3cb3b681b
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r9" into ↵Android Merger
nougat-mr1-cts-dev am: 8ca6717acb -s ours"
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r9" into ↵tinazh
nougat-mr1-cts-dev am: 8ca6717acb -s ours Change-Id: Iaa2b41b9e479747f5d9abe2d62de5641e3958ecb
2017-08-09Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵Android Merger
6.0_r22" into marshmallow-cts-dev am: 6a48394c66 -s ours" into nougat-cts-dev am: 0705935ca9 -s ours" into nougat-mr1-cts-dev am: 2f3e933650 -s ours"
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" into ↵Android Merger
nougat-cts-dev am: 9348a31a0a -s ours" into nougat-mr1-cts-dev
2017-08-09Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" ↵tinazh
into marshmallow-cts-dev am: 6a48394c66 -s ours" into nougat-cts-dev am: 0705935ca9 -s ours" into nougat-mr1-cts-dev am: 2f3e933650 -s ours Change-Id: I79a347fc3fa61414f98b1584d851f9c6626222cd
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" into nougat-cts-devtinazh
am: 9348a31a0a -s ours Change-Id: I44c9826f0f772919f14c32d45e1ed252d448fcc4
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r9" into ↵Treehugger Robot
nougat-mr1-cts-dev
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" into nougat-cts-devTreehugger Robot
2017-08-09Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" ↵Android Merger
into marshmallow-cts-dev am: 6a48394c66 -s ours" into nougat-cts-dev am: 0705935ca9 -s ours" into nougat-mr1-cts-dev
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into ↵tinazh
marshmallow-cts-dev am: 6a48394c66 -s ours" into nougat-cts-dev am: 0705935ca9 -s ours Change-Id: I797f9705a4489cf4eec2904a22b97f94594d1cfc
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into ↵Android Merger
marshmallow-cts-dev am: 6a48394c66 -s ours" into nougat-cts-dev
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into ↵tinazh
marshmallow-cts-dev am: 6a48394c66 -s ours Change-Id: I5ba1f7f7d83e5c6723cc60d298b7b358844687e3
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into ↵Treehugger Robot
marshmallow-cts-dev
2017-08-08DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r9tinazh
Change-Id: Id3a50ca3e00f0c5de37f9a2e67694a9335ab3957
2017-08-09Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier ↵Android Merger
to 5.1_r23" into lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours" into nougat-cts-dev am: d70c7774ab -s ours" into nougat-mr1-cts-dev am: 0cad5fc682 -s ours"
2017-08-09Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵tinazh
5.1_r23" into lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours" into nougat-cts-dev am: d70c7774ab -s ours" into nougat-mr1-cts-dev am: 0cad5fc682 -s ours Change-Id: I038cd1bce2a6235b10b811f92890ffd60e197d81
2017-08-08DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13tinazh
Change-Id: Ib980aad22e1fd693b5890e62616eaa606f0990f9
2017-08-09Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵Android Merger
5.1_r23" into lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours" into nougat-cts-dev am: d70c7774ab -s ours" into nougat-mr1-cts-dev
2017-08-09Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" ↵tinazh
into lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours" into nougat-cts-dev am: d70c7774ab -s ours Change-Id: Ie07c5a110c0edd75a64a90edd0e491c321a5a59d
2017-08-09Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" ↵Android Merger
into lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours" into nougat-cts-dev
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into ↵tinazh
lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev am: 4008868588 -s ours Change-Id: Ibf6cec218dac2c1082659daec435562bf0ead386
2017-08-08DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22tinazh
Change-Id: I749baa4a047a0edffc189b638214d3df132e9138
2017-08-09Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into ↵Android Merger
lollipop-mr1-cts-dev am: cd905ac74c -s ours" into marshmallow-cts-dev
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into ↵tinazh
lollipop-mr1-cts-dev am: cd905ac74c -s ours Change-Id: I69ebedf5b300e2c7e02b5a0949eb720a90777752
2017-08-09Add lib/exec for dl.* tests from bionicJiyong Park
The dl.* tests require helper executable and libs, which must be copied to the device along with the test. Bug: 64484123 Test: run CtsBionicTestCases. dl.* tests are successful Change-Id: Ia83ff624f6da0418cd731c4d42b7cd0f2f0219f2
2017-08-09Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into ↵Treehugger Robot
lollipop-mr1-cts-dev
2017-08-08DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23tinazh
Change-Id: I5e98f02e02b6a71230e2c41e5979f5303d0bf628
2017-08-08Merge changes from topic 'am-7a5bbc1c48274d1f9d0870ed0954ac98'Android Merger
* changes: Merge changes from topic 'am-78a7e8ae4c3f4e7790bb092532ae0562' into nougat-mr1-cts-dev am: b7d6f973af DO NOT MERGE StagefrightTest: add test for OOB write in sonivox. am: 255ec553e9 -s ours am: 7f8d0585ad -s ours am: fa4b2acb72 -s ours am: 0c65cf02a4 -s ours
2017-08-08Merge changes from topic 'am-78a7e8ae4c3f4e7790bb092532ae0562' into ↵Wei Jia
nougat-mr1-cts-dev am: b7d6f973af Change-Id: If372dd29e01cd6d55a1a34b37fe3b21c8f351f9e