Android Merger
8fdd4e84ce
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3 am: 63721f94a0 am: 85e2fc4b45
...
am: 594221b7ba
Change-Id: I8e15f0cce4eb0183d030698a8441b6e6986b53cb
2018-01-10 20:32:41 +00:00
Adam Vartanian
525b854ebf
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f am: 90ee516098 am: 59942f6f77
...
am: fb6a84fe87 -s ours
Change-Id: I1d23ad84760e9ea90895ee04756a0599f4299f41
2018-01-10 20:17:35 +00:00
Android Merger
594221b7ba
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3 am: 63721f94a0
...
am: 85e2fc4b45
Change-Id: I0abe7a43f797f25673a48475eb24972485b52e5d
2018-01-10 20:15:42 +00:00
Android Merger
d9e482a84b
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d am: 239831c86b am: 416375dd21
...
am: 89e39e7fd2
Change-Id: I8c63dd53a32558956130f95366c3bd3913859eb4
2018-01-10 20:15:42 +00:00
Adam Vartanian
fb6a84fe87
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f am: 90ee516098
...
am: 59942f6f77
Change-Id: I395b0060e6aff8dc0031f04c3991c03f2bc3c30e
2018-01-10 20:05:10 +00:00
Android Merger
85e2fc4b45
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3
...
am: 63721f94a0
Change-Id: I9277354d4b5761281c30581603023485a8808dc6
2018-01-10 20:02:33 +00:00
Android Merger
89e39e7fd2
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d am: 239831c86b
...
am: 416375dd21
Change-Id: Ia87ed49c075cfc939929517aaa04fdcd9928d23f
2018-01-10 19:59:50 +00:00
Adam Vartanian
59942f6f77
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f
...
am: 90ee516098
Change-Id: I7fc9142fd24fd07b420dcc8ca013253b3106cd98
2018-01-10 19:58:43 +00:00
Adam Vartanian
cc09e944b6
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389 am: eb7c20df71 am: 09c18b79e0
...
am: 19181ad787 -s ours
Change-Id: I2f1e1ed6ead90e8efc964a3bf44fa99914bd253e
2018-01-10 19:56:35 +00:00
Android Merger
63721f94a0
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604
...
am: b14f56b2c3
Change-Id: I2aa58504d0856a381f34a1febd9bcb380950acc1
2018-01-10 19:48:22 +00:00
Android Merger
416375dd21
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d
...
am: 239831c86b
Change-Id: I38249d4841d8750aba9c3900edce8fce473e8e65
2018-01-10 19:47:54 +00:00
Adam Vartanian
19181ad787
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389 am: eb7c20df71
...
am: 09c18b79e0
Change-Id: I54a1eca54c2a50d5545875a66fed9766b409438a
2018-01-10 19:47:19 +00:00
Adam Vartanian
90ee516098
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours
...
am: 2ff1dfc44f
Change-Id: Ia986f28e8de96ef1776f9c919321646862e37323
2018-01-10 19:43:50 +00:00
Adam Vartanian
09c18b79e0
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389
...
am: eb7c20df71
Change-Id: I0be9450ac48356351c11e532db821a8b0ef12fad
2018-01-10 19:39:05 +00:00
Android Merger
239831c86b
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
...
am: 1858de921d
Change-Id: Ib7210f7529d9c6dba5b601bd3e47dd612cc64598
2018-01-10 19:34:52 +00:00
Adam Vartanian
eb7c20df71
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
...
am: 7ae5d30389
Change-Id: I994db8bc76d71aabcd14acd4082d1d24d8971067
2018-01-10 19:30:01 +00:00
Android Merger
b14f56b2c3
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
am: d9aadde604
Change-Id: I9a9f644d102fb0bf576806a450fcb70bfc428ddb
2018-01-10 19:29:47 +00:00
Adam Vartanian
2ff1dfc44f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: df249cbcbb -s ours
Change-Id: I805acab23406098716c465c6711a95a4845e17b6
2018-01-10 19:29:14 +00:00
Android Merger
1858de921d
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
am: fa209394f0
Change-Id: Ib97632986b715e1ae2148287d0d6d530bb5124ad
2018-01-10 19:23:08 +00:00
Adam Vartanian
7ae5d30389
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
...
am: 7955a4e8d8 -s ours
Change-Id: I38ba41fa89303dad989c86bba8fd0ba8bf0e1b13
2018-01-10 19:22:38 +00:00
Android Merger
d9aadde604
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
2018-01-10 19:15:20 +00:00
Android Merger
c8d546b3ab
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
am: f59fbfb5a4
Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
2018-01-10 19:14:50 +00:00
Adam Vartanian
df249cbcbb
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
...
am: 175d980772 -s ours
Change-Id: I9f2de682ef6178fa6c58781e393f53b96ccb2e1e
2018-01-10 19:12:57 +00:00
Android Merger
fa209394f0
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
* changes:
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
am: 76faaa3996
Change-Id: I8c07170ab322c1ea8d40df9302733132a604b0c9
2018-01-10 19:10:54 +00:00
Adam Vartanian
7955a4e8d8
DO NOT MERGE Add CTS test for URI fix.
...
am: 08044f045c -s ours
Change-Id: I41b3f407c0e7714b80e935fb7ae556a2558cd143
2018-01-10 19:10:30 +00:00
Android Merger
f59fbfb5a4
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e
Merge changes from topic "n" into nougat-cts-dev
...
am: a220d6d27d
Change-Id: I406953a4713b768012d123a33db06268e8cf3799
2018-01-10 19:07:44 +00:00
Adam Vartanian
175d980772
DO NOT MERGE Add CTS test for URI fix.
...
am: 53a9c9bc34 -s ours
Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
2018-01-10 19:07:26 +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
Treehugger Robot
a220d6d27d
Merge changes from topic "n" into nougat-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 18:59:52 +00:00
Android Merger
c08d2f0757
Manually fastforward platform/cts.
...
am: 6854ee9f79 -s ours
Change-Id: Id4abadd9cb8ebecbdc28f59d0335d34b279f4ef6
2018-01-09 18:50:06 +00:00
The Android Automerger
6854ee9f79
Manually fastforward platform/cts.
...
platform/cts shoves too many changes at one into automerger and it slows everyone else down. Manually merging everything in platform/cts that needs to be merged to unblock other things.
2018-01-09 18:09:27 +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
53a9c9bc34
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 12:57:18 -08:00
Android Merger
27c443b156
Merge "Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c am: cd4ab882f0" am: ad8ac5480f am: 4ade7ff501
...
am: b7698c97be
Change-Id: I39d72b757d4793f99e9429108c33a972710b784a
2018-01-08 19:03:26 +00:00
Android Merger
b7698c97be
Merge "Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c am: cd4ab882f0" am: ad8ac5480f
...
am: 4ade7ff501
Change-Id: I30347304a83ae33f0fd301d553189be49cb5b017
2018-01-08 18:53:19 +00:00
Sudheer Shanka
a353a9bf2b
Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev
...
am: e352866bee
Change-Id: I62d301dd0c4f026ea4f52de0ad706d50ff5382e4
2018-01-06 01:42:28 +00:00
Android Merger
93d6d7961c
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b am: 66aec9074f" am: 51884f173c am: 9edb6f3e9a
...
am: f9832ef7e7
Change-Id: I1f79c88699b781799f6bc5d4569deb20fafbf678
2018-01-05 22:24:07 +00:00
Android Merger
f9832ef7e7
Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b am: 66aec9074f" am: 51884f173c
...
am: 9edb6f3e9a
Change-Id: I1f4ad20a03ce0a7bc4ae503c5f874079edc97288
2018-01-05 22:02:37 +00:00
Adam Vartanian
5dc6849013
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c
...
am: cd4ab882f0
Change-Id: I2f49f443143274a2deeccbdd7aa85d9484997c44
2018-01-05 20:43:59 +00:00
Etan Cohen
d4c6acbb54
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b
...
am: 66aec9074f
Change-Id: Ib7bb8eff71a9358bea9a1425b08e9a43d3f2cb2c
2018-01-05 19:39:42 +00:00
Manoj Boopathi Raj
6e2018b7eb
Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf am: 397ebd2edb
...
am: d0b69020dd
Change-Id: I11884ed92fbec0119ecb70289409d8e0f5d1493b
2018-01-04 18:59:03 +00:00
Manoj Boopathi Raj
d0b69020dd
Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf
...
am: 397ebd2edb
Change-Id: I401e26896dfb47f8c95d27a029fe4893e8d88b70
2018-01-04 18:53:11 +00:00
Sudheer Shanka
2afa7e6e4b
Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee am: dfc9fb0901
...
am: 87c8dbbc39
Change-Id: Ie190f774998de77843b8af9ef25bbfef615c66bb
2018-01-03 20:42:05 +00:00
Sudheer Shanka
87c8dbbc39
Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee
...
am: dfc9fb0901
Change-Id: I81f9100fa7e10c1a18225733a6ce5c3645876a46
2018-01-03 20:32:37 +00:00
manojboopathi
f1c7d18cf2
Added CTS to test dual stack socket for TCP & UDP
...
This ensures the function IpSecManager.applyTransportModeTransform()
works as expected when used with Java sockets.
Bug: 70160694
Test: Ran CTS test (./run_cts.sh)
Change-Id: Ia4b636c0f48a0eeffb8813d271e59aeb86bd44bc
2018-01-02 13:54:04 -08:00
Benedict Wong
92e883e060
Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315 am: 19e33b5078
...
am: 8080294716
Change-Id: I65d3b216f2ce516d85cd7920763a3caa0ee6cde5
2017-12-22 05:03:30 +00:00
Benedict Wong
8080294716
Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315
...
am: 19e33b5078
Change-Id: I26fac4d14dc6b88ecb9bdbfce88d9f72500ee180
2017-12-22 04:58:01 +00:00
Benedict Wong
b04f7cea99
Fix IpSecManager CTS tests on 4.4 kernels
...
Investigation shows that 4.4 kernels take longer for loopback TCP
packets to be ack'd, and results in extra ack packets to be generated in
cases where both the server and client sockets send data packets at the
same time. This was verified via TCPdump, where an extra ack packet was
generated per run of the bidirectional transmissions in checkTcp().
This change verifies that the data + ack packets have been sent and
counted before initiating the reverse transmission. Further, changes
have been made to improve the reliability of this code via counting
expected packets (rather than sleeps).
Bug: 62994731
Test: CTS tests run (and passing) on walleye, marlin and angler
Change-Id: I7c707ec3b11235a5a9cba10275aee40e2eb37169
2017-12-21 15:02:04 -08:00