Adam Vartanian
23d6ba00ec
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
...
am: ce2230abfd
2018-01-10 19:21:56 +00:00
Adam Vartanian
2f42f87a5f
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
...
am: 78f5d24a4f
2018-01-10 19:21:03 +00:00
Adam Vartanian
ce2230abfd
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
am: 76faaa3996
2018-01-10 19:15:04 +00:00
Adam Vartanian
78f5d24a4f
DO NOT MERGE Add CTS test for URI fix.
...
am: 08044f045c
2018-01-10 19:14:52 +00:00
Treehugger Robot
76faaa3996
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:06:35 +00:00
Adam Vartanian
08044f045c
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c
2018-01-08 13:31:30 -08:00
Adam Vartanian
83f1303285
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646
...
am: fb73667810
2017-11-07 22:56:57 +00:00
Adam Vartanian
fb73667810
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052
...
am: 2204809646
2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
...
am: 1e1de4f052
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
...
am: e88ef1b832
Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
...
am: c210cc1a90
Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa
Add CTS test for URI fix. am: a01da8536c
...
am: b1b5379591
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591
Add CTS test for URI fix.
...
am: a01da8536c
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c
Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Sudheer Shanka
b3b2ee88cd
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48
...
am: 7cbb2f7587
2017-09-07 18:29:40 +00:00
Sudheer Shanka
7cbb2f7587
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a
...
am: 46f8aa6d48
2017-09-07 18:25:15 +00:00
Sudheer Shanka
be2d3c2871
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b
...
am: f0bc6efb5e
2017-09-07 18:24:22 +00:00
Sudheer Shanka
46f8aa6d48
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3
...
am: 662e13b57a
2017-09-07 18:20:35 +00:00
Sudheer Shanka
f0bc6efb5e
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
2017-09-07 18:17:21 +00:00
Sudheer Shanka
662e13b57a
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: I7bd246e79792960c53e12c166a255eabe7f428ed
2017-09-07 18:11:26 +00:00
Android Merger
b5abc8f89b
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
2017-09-07 18:08:35 +00:00
Sudheer Shanka
9418ecdc40
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6
2017-09-07 18:08:27 +00:00
Sudheer Shanka
07e00f7523
Increase timeout for ordered broadcast response.
...
Bug: 65269531
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Merged-In: Ibdb84048b04405f234aa5ad9124eb70e9e592498
Merged-In: I99668396abcf7421cd7ffb9118e309aaecb80f07
Change-Id: I6f1de7ccc8d4164dc6f770b54863c04bb7d9e62e
2017-09-05 14:56:04 -07:00
Lorenzo Colitti
d4df358e42
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
...
am: 80c62eb79b
2017-08-09 16:35:45 +00:00
Lorenzo Colitti
80c62eb79b
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
...
am: bfabfe75f9
2017-08-09 16:29:49 +00:00
Treehugger Robot
bfabfe75f9
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
2017-08-09 16:17:22 +00:00
Chenbo Feng
907ef28ed9
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab
...
am: 120ebca195
2017-07-18 18:35:41 +00:00
Chenbo Feng
120ebca195
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1
...
am: 0545b99cab
2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab
Resolve merge conflicts of 2ce31b513f to nyc-dev
...
am: 3d166665b1
2017-07-18 18:14:42 +00:00
Chenbo Feng
3d166665b1
Resolve merge conflicts of 2ce31b513f to nyc-dev
...
Merged-In: Ie9ed8aa604be7c6ae364baa69922b89c006dea72
Test: I solemnly swear I tested this conflict resolution.
Bug: 62489688
2017-07-17 22:34:13 +00:00
Chenbo Feng
6bff534f60
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834
...
am: 4b7b9dd4ab
2017-07-17 21:26:53 +00:00
Chenbo Feng
4b7b9dd4ab
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01
...
am: 05f5afd834
2017-07-17 21:22:51 +00:00
Chenbo Feng
a75b9016f1
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77
...
am: e2753dbabb
2017-07-17 21:18:55 +00:00
Chenbo Feng
05f5afd834
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e
...
am: 280d269f01
2017-07-17 21:16:26 +00:00
Chenbo Feng
e2753dbabb
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
...
am: 26339f2d77
2017-07-17 21:11:59 +00:00
Chenbo Feng
280d269f01
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
...
am: e37efbd57e
Change-Id: I40463d0c63199f3e93288a95c5ca6cc5eb52f500
2017-07-17 21:09:29 +00:00
Android Merger
26339f2d77
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
2017-07-17 21:02:57 +00:00
Chenbo Feng
3cd4cc6251
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
...
am: e37efbd57e
Change-Id: Ic7c13aa9c7abee40a812f6d7879a2d474f096d03
2017-07-17 21:02:46 +00:00
Chenbo Feng
997814263d
Resolve merge conflicts of 8482d8c85c to nougat-cts-dev
...
Test: I solemnly swear I tested this conflict resolution.
in cts-tf: run cts --module CtsNativeNetTestCases
Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea
2017-07-17 20:44:39 +00:00
Tina Zhou
576bfa9242
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
...
am: 14a394402f
Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e
2017-07-13 21:17:09 +00:00
Tina Zhou
766fa6a623
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev
...
am: 8482d8c85c
Change-Id: I2fefc3090844c2ed9be8434ad0d0bcd11af13d08
2017-07-13 21:02:32 +00:00
Lorenzo Colitti
08bdb15d74
Dup fds to stop finalizers from invalidating them.
...
The hostside VPN tests were failing because finalizers were
closing the ParcelFileDescriptors that we use to get socekt fds.
The close operations were causing the fds to be marked as invalid
(i.e., -1), causing the tests' system calls on them to fail with
EBADF.
Fix this by dup(2)ing the fds and closing the original objects.
Also, add some asserts to debug this sort of failure.
Fix: 35927643
Test: HostsideVpnTests passed 20/20 times on bullhead
Change-Id: If88530b5bd32622bd4726cd6f0907f731209bb43
(cherry picked from commit a7ec8300d9
2017-07-07 06:30:00 +00:00
Chenbo Feng
ba65ffc462
Add test to check sock addr in qtaguid ctrl file
...
This test verifies the socket address information is not leaked by
xt_qtaguid module inside the kernel. The sock_addr parsed from
proc/net/xt_qtaguid/ctrl file should always be 0
Bug: 62489688
Test: in cts-tf: run cts --package android.net.native
2017-06-28 13:47:30 -07:00
Tina Zhou
ba9c18e7af
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f
...
am: af849f9dc0
2017-04-17 17:48:16 +00:00
Tina Zhou
af849f9dc0
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
...
am: 6ee31c8e8f
2017-04-17 17:43:44 +00:00
Tina Zhou
6ee31c8e8f
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
2017-04-17 17:37:29 +00:00
Sudheer Shanka
24df7fc52b
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours
...
am: 4ecf9aadc5
2017-04-14 00:48:47 +00:00
Sudheer Shanka
4ecf9aadc5
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev
...
am: 4b656d1d00
2017-04-14 00:43:16 +00:00
Treehugger Robot
4b656d1d00
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev
2017-04-14 00:36:09 +00:00
Sudheer Shanka
a12dbc91c5
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours
...
am: 64c8f23d98
2017-04-14 00:30:45 +00:00
