Android Merger
9595c5bda0
Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd
...
am: 3d5a649ea6
Change-Id: Ia8f8e4beff5a291d0446cfe823daab08f8e624ee
2018-01-10 20:16:40 +00:00
Adam Vartanian
626d5efb37
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: d89f75a3db -s ours am: db4ab12068 -s ours
...
am: 7c6875bef1
Change-Id: Ide06fd43446570e000aab6d68eef95f2f98e8bf7
2018-01-10 20:13:14 +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
2018-01-10 20:05:10 +00:00
Android Merger
89e39e7fd2
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d am: 239831c86b
...
am: 416375dd21
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
2018-01-10 19:58:43 +00:00
Android Merger
416375dd21
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d
...
am: 239831c86b
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
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
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
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
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
2018-01-10 19:30:01 +00:00
Adam Vartanian
2ff1dfc44f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: df249cbcbb
2018-01-10 19:29:14 +00:00
Android Merger
7aa66922dd
Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986"
...
* changes:
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d08044f045c7955a4e8d8d89f75a3db
2018-01-10 19:27:09 +00:00
Android Merger
90b129d44e
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
am: 36407c961d
2018-01-10 19:26:44 +00:00
Android Merger
1858de921d
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
am: fa209394f0
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
2018-01-10 19:22:38 +00:00
Adam Vartanian
db4ab12068
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
...
am: d89f75a3db
2018-01-10 19:22:28 +00:00
Android Merger
36407c961d
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f008044f045c7955a4e8d8
2018-01-10 19:17:29 +00:00
Android Merger
599f3a3c3f
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
am: fa209394f0
2018-01-10 19:17:04 +00:00
Adam Vartanian
d89f75a3db
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
...
am: 7955a4e8d8
2018-01-10 19:14:29 +00:00
Adam Vartanian
df249cbcbb
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
...
am: 175d980772
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: 76faaa399608044f045c
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
am: 76faaa3996
2018-01-10 19:10:54 +00:00
Adam Vartanian
7955a4e8d8
DO NOT MERGE Add CTS test for URI fix.
...
am: 08044f045c
2018-01-10 19:10:30 +00:00
Adam Vartanian
175d980772
DO NOT MERGE Add CTS test for URI fix.
...
am: 53a9c9bc34
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
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
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
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
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
2018-01-05 19:39:42 +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
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
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
Sudheer Shanka
b7a503b578
Skip unsupported tests on low ram devices.
...
Notification listeners are not allowed on low ram devices.
Skip testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
on low ram devices since these tests depend on being able to
register notification listeners.
Bug: 70242457
Bug: 70545780
Test: testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I8ce6f330760042ca790cd6fb10e62ebe86498a06
2017-12-21 11:23:21 -08:00
Benedict Wong
2b43c590b6
Merge "[ipsec-qtaguid] Update tests to check data usage" am: eca595be58
...
am: 50609feb1c
Change-Id: I1d465ac9e1200dec6679879f92e1582e5fe53652
2017-12-19 00:24:41 +00:00
Benedict Wong
eca595be58
Merge "[ipsec-qtaguid] Update tests to check data usage"
2017-12-18 23:50:52 +00:00
Benedict Wong
0bff9ab1c4
[ipsec-qtaguid] Update tests to check data usage
...
This change ensures that all forms of transport-mode packets are
correctly accounted for, and not double-counted. This includes both
per-UID counters, as well as interface counters.
Bug: 62994731
Test: CTS tests updated, passing
Change-Id: I83be0724ac21d9db7d91ce72733d13fb6736e66e
2017-12-18 19:46:30 +00:00
David Benjamin
a92a6bb33e
Merge "Clear some random compile warnings." am: 8d7d4479a5
...
am: 2730c60fde
Change-Id: If25634c6867446c79735a433a2238aebfde72b34
2017-12-14 22:16:00 +00:00
Treehugger Robot
8d7d4479a5
Merge "Clear some random compile warnings."
2017-12-14 21:51:21 +00:00
nharold
b69ec1d499
Merge "Update CTS to use renamed API method." am: 123988e6e1
...
am: 51fc96db37
Change-Id: I4c64458a793b56b3daf11287d340ead4bd40948d
2017-12-14 21:32:52 +00:00
nharold
123988e6e1
Merge "Update CTS to use renamed API method."
2017-12-14 21:10:16 +00:00
Jonathan Basseri
b58d3aa5b8
Update CTS to use renamed API method.
...
IPsec API is renaming reserveSecurityParameterIndex to
allocateSecurityParameterIndex. Update tests to reflect this.
Bug: 69128142
Test: TreeHugger should be enough
Change-Id: I0bfaa3584920096ffde7f9eeee9fccd0ec842821
2017-12-14 21:09:28 +00:00
David Benjamin
6208358a7c
Clear some random compile warnings.
...
I saw a bunch fly by. Here are a few fixes.
ssize_t is %zd. Types from stdint.h use PRI* macros from inttypes.h.
Finally, use C99 initializers rather than the old GNU extension.
Test: make checkbuild
Change-Id: I343dfb99984ab826c7641e311e041e859eb61d93
2017-12-13 22:15:09 +00:00
Nathan Harold
9a607658e4
Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272
...
am: d79c57dde6
Change-Id: I6c09b8b271486530a10d6e4f2beec2aa6b9e9d0c
2017-12-13 03:57:02 +00:00
