Commit Graph

2336 Commits

Author SHA1 Message Date
Ray Essick
416fa992a9 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours am: 00eb32582d -s ours
am: af5b3958ae  -s ours

Change-Id: I9850b877597ce963d9bff29641673ae1333c8482
2018-04-09 17:18:18 -07:00
Ray Essick
bd51d01139 Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8" am: 1a07cdce11
am: cd3957ee75

Change-Id: Ic58bacb77b750307173fd8dfc6edaacd6126c454
2018-04-09 17:08:07 -07:00
Ray Essick
170d735f6e [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 am: eba4cb5e97 -s ours
am: 75b1d37e37  -s ours

Change-Id: I2191222a56bf3642b742a6a880b692f57579001b
2018-04-09 17:02:22 -07:00
Ray Essick
27fec8a834 Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08" am: 7f66d8d286
am: 618bbf146b

Change-Id: Ib90a5a7ca709fbb071a4563dc818c0b993ede2af
2018-04-09 16:33:45 -07:00
Ray Essick
73b129ec13 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: d0ff8fbabb -s ours
am: 52211eb32f  -s ours

Change-Id: I1832558dfd5d2a2b4f716a4d9d7db45c9ba25098
2018-04-09 16:30:39 -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
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
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
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
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
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
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
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
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
Lorenzo Colitti
58595f64fc Merge "Revert "Add cts to test unwanted capabilities api"" into pi-dev
am: 02ac7a51c7

Change-Id: I6b0b1fcc02e00cbb02827196a26d3c0c222a49de
2018-04-06 19:51:47 -07:00
Lorenzo Colitti
356139091d Revert "Add cts to test unwanted capabilities api"
This reverts commit bf6a2ad00c.

Bug: 77601789
Test: atest android.net.cts.NetworkRequestTest
Change-Id: Ib3db82e889ed4ca050a837b1169a9da8e17bb424
2018-04-06 22:44:19 +09:00
Pavel Maltsev
70d68366a8 Merge "Add cts to test unwanted capabilities api" into pi-dev
am: 4997cbc5ae

Change-Id: Ie87f8ce461e623f9d546e80ebfbe54583a7c24f9
2018-04-04 10:07:02 -07:00
TreeHugger Robot
4997cbc5ae Merge "Add cts to test unwanted capabilities api" into pi-dev 2018-04-04 16:55:14 +00:00
Ricky Wai
4a65f50f6d Merge "Set empty watchlist test config before CTS" into pi-dev
am: 934dd7cacc

Change-Id: I7aa23332f79123f1761d372a9afba8c7e1bca05e
2018-04-03 10:45:19 -07:00
Ricky Wai
934dd7cacc Merge "Set empty watchlist test config before CTS" into pi-dev 2018-04-03 17:28:13 +00:00
Pavel Maltsev
bf6a2ad00c Add cts to test unwanted capabilities api
Test: atest android.net.cts.NetworkRequestTest
Bug: 74945408
Bug: 72828388
Change-Id: I19099a3d7a555f610c96eb1859493903152e10a3
2018-04-03 09:55:54 -07:00
Chalard Jean
81e5cebe89 [automerger skipped] Merge "Add CTS tests for getMultipathPreference" am: 8d66f2dc82
am: f08cb4d828  -s ours

Change-Id: I090514ca4feac13b37cb8ac43ecc38dbc5d70d20
2018-04-03 02:59:05 -07:00
Chalard Jean
8d66f2dc82 Merge "Add CTS tests for getMultipathPreference" 2018-04-03 09:16:09 +00:00
Jiyong Park
9eb7a0feaa Merge "Allow net and media CTS tests to use hidden APIs" into pi-dev
am: 3233266e8d

Change-Id: Iab46c47114d535f26e8c044c4455cb7fd00c78fd
2018-04-02 23:31:18 -07:00
TreeHugger Robot
3233266e8d Merge "Allow net and media CTS tests to use hidden APIs" into pi-dev 2018-04-03 06:18:49 +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
Chalard Jean
5ae4cd397d Merge "Add CTS tests for getMultipathPreference" into pi-dev
am: 38c80d304a

Change-Id: I8377ca86f047dc640a074828a5858fc419ec5489
2018-04-02 20:31:53 +00:00
TreeHugger Robot
38c80d304a Merge "Add CTS tests for getMultipathPreference" into pi-dev 2018-04-02 11:56:24 +00:00
Jiyong Park
b58fc866b4 Allow net and media CTS tests to use hidden APIs
MediaRecorderTest uses EncoderCapabilities.getVideoEncoders().
WifiManagerTest uses WifiManager.getTxPackageCount().

Pass the 'hidden-api-checks=false' flag to temporarily exempt the two
CTS packages from the hidden api check. We eventually should fix the
hidden API usage completely or exempt the violating tests only.

Bug: 77436928
Test: atest CtsMediaTestCases
Test: atest CtsNetTestCases
Change-Id: I85efbb08c24b87079c0360fc3f9a2267462592f0
2018-04-01 17:05:33 +09:00
Lorenzo Colitti
6b013119c7 [automerger skipped] Merge changes from topic "generic-sockets" into pi-dev
am: 0599bb578e  -s ours

Change-Id: I1a9af9f235d95594d6ed40f943a15ee5aaa51131
2018-03-31 07:49:40 +00:00
Lorenzo Colitti
0599bb578e Merge changes from topic "generic-sockets" into pi-dev
* changes:
  Prevent CTS from hanging if no UDP packet was received
  Switch checkTcp and checkUnconnectedUdp to use generic sockets
  Add generic socket interfaces and functions
  Add GCM to algorithms tested in CTS
2018-03-31 07:37:11 +00:00
Ricky Wai
087de1c815 Set empty watchlist test config before CTS
Test: CTS pass
Bug: 63908748
Change-Id: I8b607feb44f873aced1ae3c2ff02c02f0553fb10
2018-03-30 23:56:35 +00:00
Benedict Wong
bbd7e7c02d [automerger skipped] Merge "Update encapSocket API calls to getFileDescriptor" into pi-dev
am: cbe0a822b7  -s ours

Change-Id: Ifa01d1d2fcbfc671361dfe21d165dcbe51b03d86
2018-03-30 22:05:18 +00:00
Benedict Wong
cbe0a822b7 Merge "Update encapSocket API calls to getFileDescriptor" into pi-dev 2018-03-30 20:28:19 +00:00
Benedict Wong
be11beb63f Merge "Prevent CTS from hanging if no UDP packet was received" am: a48cb94938
am: 2a1b3d9320

Change-Id: Ia7bf725b3f30f3f288062ae170e8e234c2bc1c60
2018-03-30 19:06:11 +00:00
Benedict Wong
46ab91c260 Merge changes from topic "generic-socket" am: 77627ce58b
am: 7a78ef4349

Change-Id: I436d439af489dbe2f688094c6f7e983bda84d20d
2018-03-30 19:03:54 +00:00
Benedict Wong
b743691880 Merge "Add GCM to algorithms tested in CTS" am: 2a4463d257
am: ec017142ec

Change-Id: I539fc2fbe5f9b04450525f7d5f9938e46c111ab7
2018-03-30 19:00:20 +00:00
Benedict Wong
b9b074bc03 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
Merged-In: I390e4585e85647eb8555e706d44b76f95dec931f
Change-Id: I390e4585e85647eb8555e706d44b76f95dec931f
(cherry picked from commit e2fcb9d64ba10f07a69a6b96a7f7e1465856172a)
2018-03-30 11:25:50 -07:00
Benedict Wong
60b87e1f6d 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
Merged-In: I515227e7aa04c424aefbbe46209ddce81421b2f1
Change-Id: I515227e7aa04c424aefbbe46209ddce81421b2f1
(cherry picked from commit 796f61bb7be36f66302311f89caa74a3a3f13dad)
2018-03-30 11:25:42 -07:00
Benedict Wong
c33ed347f0 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
Merged-In: I9bd57d6267f82d8c1ac293a0147dc2c115dd4181
Change-Id: I9bd57d6267f82d8c1ac293a0147dc2c115dd4181
(cherry picked from commit d524e0785c7bbe5c7987f8ae01fdc5d57e13545d)
2018-03-30 11:25:31 -07:00