Commit Graph

1918 Commits

Author SHA1 Message Date
Ray Essick
d3937d2d27 Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
am: f0c2985ba8

Change-Id: I3e33fc2e58cccd07cdd4475e5abf50824072ae48
2018-04-09 16:17:28 -07:00
Ray Essick
2040949cb3 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
am: 3ace7af527  -s ours

Change-Id: Ic435e9365fbb61b0bdaa8096513f756136433b85
2018-04-09 16:11:03 -07:00
Android Merger
52525a8839 Merge changes from topic "am-d23ca51b7f164fc892e8bdfd6febf406"
* changes:
  Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev am: f095afee74
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours am: 26d4c1f151  -s ours
2018-04-09 23:05:14 +00:00
Ray Essick
749318c148 Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
am: f095afee74

Change-Id: Idff151e5b917ffdcd35cf25a674ba42f1903ca51
2018-04-09 16:04:27 -07:00
Ray Essick
00eb32582d [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
am: 26d4c1f151  -s ours

Change-Id: I395b7562f3b6b46c42dc27f6006f5a41ca8f39a3
2018-04-09 16:00:28 -07:00
Android Merger
f0c2985ba8 Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours
2018-04-09 22:53:51 +00:00
Ray Essick
d9a966f2f9 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: Ia6a800ccdc908776040c2d9b2a793fbdb2e174fc
2018-04-09 15:53:38 -07:00
Android Merger
1a07cdce11 Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8"
* changes:
  Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours am: f3d4af802c  -s ours
2018-04-09 22:50:35 +00:00
Ray Essick
e50a8571cb Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: 666f941b5a

Change-Id: Ia4f0cd73ea201ba4fe8ad827712d4a34746bec21
2018-04-09 15:50:14 -07:00
Ray Essick
3ace7af527 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours
am: 308f60a04c  -s ours

Change-Id: I2c54e0109d53efdeff69279f0c796d5bf103a58e
2018-04-09 15:48:01 -07:00
Ray Essick
eba4cb5e97 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
am: f3d4af802c  -s ours

Change-Id: Iaf42de1c60bf096cf31edbf0ed60586aa42b85d5
2018-04-09 15:43:48 -07:00
Android Merger
7f66d8d286 Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08"
* changes:
  Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121  -s ours
2018-04-09 22:40:10 +00:00
Ray Essick
6e26a15b5d Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
am: f5e53a396f

Change-Id: I1badabd184e729031a7279cbc31c5c4c6449d591
2018-04-09 15:39:57 -07:00
Android Merger
f095afee74 Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours
2018-04-09 22:39:44 +00:00
Ray Essick
12cc7ae103 Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
am: 6977a333a5

Change-Id: I7c4d9e4ee3339a65bd7da67674d932813b588725
2018-04-09 15:39:30 -07:00
Ray Essick
d0ff8fbabb [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ac5b691121  -s ours

Change-Id: I817590ef40c3934877f2e86d2f5536ea0625876b
2018-04-09 15:39:16 -07:00
Ray Essick
26d4c1f151 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ae91a6ad6f  -s ours

Change-Id: I07f5461359c0b0d810d90c8a208c2c9fa00e1413
2018-04-09 15:38:51 -07:00
Android Merger
666f941b5a Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours
2018-04-09 22:38:18 +00:00
Treehugger Robot
f5e53a396f Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
  DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:37:33 +00:00
Ray Essick
a0de7cb873 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
am: 0eeb6c53d1

Change-Id: I999d875a15b9a037165e4782f285a591334b4daf
2018-04-09 15:37:30 -07:00
Android Merger
1c90ff8dcf Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
* changes:
  Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours
2018-04-09 22:37:07 +00:00
Ray Essick
d5a0345907 Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
am: 36b9badd7a

Change-Id: I05ed05ee99fa59d9de6a50b84746b98fca7eefff
2018-04-09 15:36:53 -07:00
Ray Essick
f3d4af802c [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
am: 8dd2d10a1b  -s ours

Change-Id: I3b2cc560a4b664399a742d4301304dcf3e99f6ed
2018-04-09 15:35:30 -07:00
Ray Essick
308f60a04c [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
am: 81f274ebb2  -s ours

Change-Id: Ia8f2c0dc1dcaa42359b2c2211a6c8d6278647f45
2018-04-09 15:35:17 -07:00
Treehugger Robot
6977a333a5 Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
  DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:30:37 +00:00
Android Merger
0eeb6c53d1 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours
2018-04-09 22:28:05 +00:00
Android Merger
36b9badd7a Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
2018-04-09 22:27:52 +00:00
Ray Essick
a1d6d60e04 Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
am: 34ef78f44f

Change-Id: I7077de030a59695ea3c1c8d99aa0b5aea3a8ef8a
2018-04-09 15:27:50 -07:00
Ray Essick
c5f84ae68a Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
am: 46b33d45f7

Change-Id: I83085ac2acf75df0557abac0118e0654c533ce28
2018-04-09 15:27:40 -07:00
Ray Essick
8dd2d10a1b [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 8a0f955e56  -s ours

Change-Id: Ib3da591114c4022fb94114f768d0ecf3f5c106b1
2018-04-09 15:27:27 -07:00
Ray Essick
81f274ebb2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: b32ca8fa74  -s ours

Change-Id: Id298dfba4969b5b1555a557fee67bb0e0a91ea7c
2018-04-09 15:27:23 -07:00
Treehugger Robot
46b33d45f7 Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
2018-04-09 22:23:16 +00:00
Treehugger Robot
34ef78f44f Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
2018-04-09 22:21:52 +00:00
Adam Vartanian
31786e4612 DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:50:16 -07:00
Adam Vartanian
ed78bcf07e DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:46:44 -07:00
Adam Vartanian
55c6004dfd DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:46:11 -07:00
Adam Vartanian
1c7d94f2f7 DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:45:37 -07:00
Chalard Jean
8d66f2dc82 Merge "Add CTS tests for getMultipathPreference" 2018-04-03 09:16:09 +00:00
Chalard Jean
8a0530bb9c Add CTS tests for getMultipathPreference
Test: Test passing with 1 or more connected wifis
      No wifi won't pass but it's already a requirement
Bug: 34630278

Change-Id: I43bf18943fbd00dc29417b18604e29f9111ec0b2
Merged-in: I43bf18943fbd00dc29417b18604e29f9111ec0b2
Merged-in: Ie90ca72ea3606dea4259984d42762dd742d59970
2018-04-03 05:27:38 +00:00
Benedict Wong
a48cb94938 Merge "Prevent CTS from hanging if no UDP packet was received" 2018-03-30 18:17:56 +00:00
Benedict Wong
ef1a43e2c1 Prevent CTS from hanging if no UDP packet was received
Previously, CTS tests could block forever on attempting to read a packet
from a UDP socket.

This patch modifies the receive methods of the NativeUdpSocket wrapper,
allowing it to gracefully fail if UDP packets are not received.
This patch also updates the IKE over UDP encap socket test to use the
NativeUdpSocket wrapper, preventing the tests from hanging in the same
fashion.

Bug: 70938121
Test: Ran updated tests on walleye + marlin
Change-Id: I390e4585e85647eb8555e706d44b76f95dec931f
2018-03-30 18:17:21 +00:00
Benedict Wong
77627ce58b Merge changes from topic "generic-socket"
* changes:
  Switch checkTcp and checkUnconnectedUdp to use generic sockets
  Add generic socket interfaces and functions
2018-03-30 18:17:01 +00:00
Benedict Wong
376335421e Switch checkTcp and checkUnconnectedUdp to use generic sockets
This patch switches IpSecManager checkTransform() tests to use generic
sockets, allowing for exercising of Java sockets as well as native/OS
sockets.

Bug: 76152303
Test: This; ran on Walleye
Change-Id: I515227e7aa04c424aefbbe46209ddce81421b2f1
2018-03-30 18:15:36 +00:00
Benedict Wong
3f6d149f3d Add generic socket interfaces and functions
This patch adds functionality to unify java and native sockets. This is
part one of two of a change to allow functionality for testing full
coverage of all APIs.

Bug: 76152303
Test: Ran tests on Walleye
Change-Id: I9bd57d6267f82d8c1ac293a0147dc2c115dd4181
2018-03-30 18:14:46 +00:00
Benedict Wong
2a4463d257 Merge "Add GCM to algorithms tested in CTS" 2018-03-30 18:14:14 +00:00
Lorenzo Colitti
8f507d4edd Merge "Update encapSocket API calls to getFileDescriptor" 2018-03-30 04:58:47 +00:00
Benedict Wong
675406b789 Update encapSocket API calls to getFileDescriptor
This change updates the getSocket calls to getFileDescriptor, persuant
to new API.

Bug: 72473753
Test: CTS tests run on walleye
Change-Id: I65479cb35c88aee1f65c8597c3382cd30fa8d4a9
2018-03-27 17:00:41 -07:00
Benedict Wong
f3e34ff699 Add GCM to algorithms tested in CTS
This change adds all combinations of GCM algorithms, ensuring proper
support, config flags, and data accounting. Algorithm for calculating
size of packets has also been made more generic to allow for calculation
based on different encryption algorithms.

Bug: 73261868
Test: This
Change-Id: Ib77ac237fee75415223f0291cecc0b60ce76b77f
2018-03-27 16:37:41 -07:00
Benedict Wong
d4477edaf3 Merge "Add tests where only auth or crypt are enabled" 2018-03-23 17:25:10 +00:00
Benedict Wong
f8ccb00aa6 Add tests where only auth or crypt are enabled
This patch adds tests for cases where only auth or crypt are enabled.
These cases are supported, and this patch adds test coverage.

Bug: 75049573
Test: this, run on walleye
Change-Id: I656d9c4a86c13ce4928d6bd68a9e0d48cf805191
2018-03-22 20:58:21 +00:00