Roshan Pius
f53628831f
Merge "WifiManagerTest: allow for multiple modes" into pi-dev
...
am: 1f34a7fcd9
Change-Id: I0738a52e6af618c7c739a1a1ec1aa434cfd7b1d3
2018-05-07 17:24:42 -07:00
android-build-prod (mdb)
67c176646e
Merge "Directly test xt_qtaguid module without libcutls" am: 106fbc7f49
...
am: 9e0e1f7273
Change-Id: I043024cf889dca276976bf5af23c6f560791d993
2018-05-02 13:26:35 -07:00
Rebecca Silberstein
d8752ba525
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-05-02 10:41:18 -07:00
android-build-team Robot
97a6c21f8d
Merge "Directly test xt_qtaguid module without libcutls" into pi-dev
...
am: fde956376e
Change-Id: Ia7884e887e7808f9a6efe803290a27e9f370ab1f
2018-05-01 21:29:11 -07:00
Chenbo Feng
012d53ba16
Directly test xt_qtaguid module without libcutls
...
The libcutls library is no longer directly writing to the xt_qtaguid
module proc file. Instead, all the qtaguid related helper function is
moved to libqtaguid in P release. So the cts should directly call into
libqtaguid instead of using libcutils to do that, otherwise it will
faill on devices that using new traffic stats tools.
Bug: 78788976
Test: atest CtsNativeNetTestCases
Change-Id: I1169f598b6e558acf1d7724416b2b70abe2f5878
Merged-In: I1169f598b6e558acf1d7724416b2b70abe2f5878
(cherry picked from aosp commit 7d9870466bc5d57769fccf43ec3d1b2716f54b81)
2018-05-01 11:46:07 -07:00
android-build-prod (mdb)
106fbc7f49
Merge "Directly test xt_qtaguid module without libcutls"
2018-05-01 15:36:19 +00:00
Chenbo Feng
a82f259492
Directly test xt_qtaguid module without libcutls
...
The libcutls library is no longer directly writing to the xt_qtaguid
module proc file. Instead, all the qtaguid related helper function is
moved to libqtaguid in P release. So the cts should directly call into
libqtaguid instead of using libcutils to do that, otherwise it will
faill on devices that using new traffic stats tools.
Bug: 78788976
Test: atest CtsNativeNetTestCases
Change-Id: I1169f598b6e558acf1d7724416b2b70abe2f5878
2018-04-27 16:16:05 -07:00
Roshan Pius
a3a3cbe75a
Merge "WifiManagerTest: Fetch scan results only on scan success" into pi-dev
...
am: 7b10bfaf01
Change-Id: If39364a768892573706c6555630bdd37869f523a
2018-04-26 14:21:44 -07:00
Benedict Wong
aa96bdc3a8
Merge "Add CTS support for eBPF" am: 5cf3c2fe86
...
am: 480d14e881
Change-Id: I8d0ff6e935d7495c14129fbf7334973417166bdd
2018-04-25 17:42:34 -07:00
Roshan Pius
7457ee7eb8
WifiManagerTest: Fetch scan results only on scan success
...
When wifi location scans are off, the scan is expected to fail. But,
WifiManager.getScanResults() could still return results from the last
scan. This was causing the test to fail because it was relying on
|mScanResults| being null to detect scan failure.
Also, changed the scan done internal state name in the test to more accurately
reflect that scan has been completed (could be success or failure).
Bug: 77601152
Test: Ran `atest android.net.wifi.cts.WifiManagerTest#
testWifiManagerScanWhenWifiOffLocationTurnedOn` with location turned on,
but wifi scans turned off.
Change-Id: I6d5203a836d86d03fbb8e9af0035fe951a6b9db8
2018-04-24 13:56:43 -07:00
Benedict Wong
fe9b0a791e
Add CTS support for eBPF
...
Addition of eBPF requires tweaks regarding packet counting of
UDP-encapsulated-ESP packet bytes. This patch conditions the expected
number of bytes received based on eBPF being enabled
Bug: 74113670
Test: Ran CTS tests, passing on 3.18, 4.4, 4.9 kernels
Change-Id: If02a4bb6ebfdf949fdb58b5816aa9d252d9eef52
2018-04-20 02:02:51 +00:00
Roshan Pius
e952b1302c
Merge "WifiManagerTest: Don't assert for isScanAlwaysAvailable" into pi-dev
...
am: 9ead90f773
Change-Id: If7b07dff9747a43025c480c4f2304f73aa39688d
2018-04-19 13:34:12 -07:00
Roshan Pius
e549804b9d
WifiManagerTest: Don't assert for isScanAlwaysAvailable
...
This may not be true on all platforms (Android wear for example don't
want to support this functionality)
Bug: 78242827
Test: atest android.net.wifi.cts
Change-Id: I73ab8cd31a9b4a29bd47f8e47957c921a0b16fa3
2018-04-18 15:48:33 -07:00
Etan Cohen
21ca62b0bf
Merge "[RTT] Increase CTS coverage" into pi-dev
...
am: 7daa6af30d
Change-Id: I8bbf8ad2b4479c8103d13ad086df4265c573049d
2018-04-14 19:05:53 -07:00
Etan Cohen
7530899eb8
[RTT] Increase CTS coverage
...
Increase CTS coverage by utilizing additional methods.
Bug: 77915947
Test: atest WifiRttTest
Change-Id: Ibc560aafb317fb27fd969b8899cc49c5cd7a979f
2018-04-13 15:17:15 -07:00
Roshan Pius
98090458b3
Merge "ScanResultTest: Retry scan attempts on failure" into pi-dev
...
am: 1026eaee92
2018-04-12 17:36:33 -07:00
TreeHugger Robot
1026eaee92
Merge "ScanResultTest: Retry scan attempts on failure" into pi-dev
2018-04-12 23:58:51 +00:00
Ray Essick
4fe47e8015
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997 am: b8f58fb9b6 am: 5a9c21fc33
...
am: 1104b83fea
2018-04-09 21:26:49 -07:00
Ray Essick
268ed90a61
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239 am: 6edfe17ca2 am: c8b558b08f -s ours
...
am: b611d433e3
2018-04-09 21:22:36 -07:00
Ray Essick
dfecb2a24e
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76 am: d89cacb7bf am: 3977adb530
...
am: 50ec655aaa
2018-04-09 21:16:58 -07:00
Ray Essick
f9d2483bf0
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc am: 56927e7cae am: 6e3df95a86 -s ours
...
am: 3e37bc925d
2018-04-09 21:13:27 -07:00
Ray Essick
f8b74b0b45
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed am: 14e18f9179 am: 213fa5b1db
...
am: e18b64e07f
2018-04-09 21:07:59 -07:00
Ray Essick
31a96575fd
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf am: 591f6ccb9c am: bff76d3a93 -s ours
...
am: 33586ec7c3
2018-04-09 21:04:22 -07:00
Ray Essick
dd4a20804a
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc am: 10bed1ef52 am: 255cbbc39c
...
am: 6cc16da2a9
2018-04-09 20:46:02 -07:00
Ray Essick
7d76fb4ff7
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6 am: 06c461a30b am: 205a892ff5 -s ours
...
am: e6af30cb2c
2018-04-09 20:42:34 -07:00
Ray Essick
5b7701b09b
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796 am: 72405a1736 am: 8101a1ba85
...
am: a2c9539bfc
2018-04-09 20:33:19 -07:00
Ray Essick
5673bfc335
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968 am: 66ef84dac4 am: 089012397b -s ours
...
am: 6c3717661f
2018-04-09 20:30:23 -07:00
Ray Essick
482dcfe374
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8 am: 37ca5b50e8 am: 0fae69ebd7
...
am: 2715d84585
2018-04-09 20:27:00 -07:00
Ray Essick
1dbf965ff8
[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: c1a7ce019c am: 7a3920dfa4 am: 6ae132c625 -s ours
...
am: 99a753312a
2018-04-09 20:23:12 -07:00
Ray Essick
142c62b9e1
Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev am: 6e146b4699
...
am: a2c6841c02
2018-04-09 20:20:07 -07:00
Ray Essick
e680cd3889
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours" into oc-mr1-dev am: 9d36da58e7 -s ours
...
am: 7f390e3f77
2018-04-09 20:16:01 -07:00
Ray Essick
d83ab7b222
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044 am: 91014e8da2
...
am: 9ca1b80cd2
2018-04-09 20:12:51 -07:00
Ray Essick
d8dd361f00
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9 am: ee4732c77c am: 03a6e259da
...
am: 186dbad0df
2018-04-09 20:09:05 -07:00
Ray Essick
26a6930fa3
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4 am: a208a33079 am: c8781cfae4 -s ours
...
am: 62874f71ec
2018-04-09 20:06:05 -07:00
Ray Essick
138e67429a
Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120 am: e9a9daa81a am: 0dc9743ac1
...
am: 991bdf22fe
2018-04-09 20:03:12 -07:00
Ray Essick
572f2bf7ec
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours" into oc-dev am: 50988d78ff am: b4dde24b91 am: 9e863b8450 -s ours
...
am: 67798ac557
2018-04-09 19:59:19 -07:00
Ray Essick
99eb8a471e
Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev am: 01a2073429
...
am: 888ba5ef93
2018-04-09 19:51:18 -07:00
Ray Essick
82f4d79ef5
Merge "[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" into oc-mr1-dev am: f893a5ace2 -s ours
...
am: bff6860b2a
2018-04-09 19:41:43 -07:00
Ray Essick
1104b83fea
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997 am: b8f58fb9b6
...
am: 5a9c21fc33
2018-04-09 19:32:17 -07:00
Ray Essick
b611d433e3
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239 am: 6edfe17ca2
...
am: c8b558b08f
2018-04-09 19:28:30 -07:00
Ray Essick
50ec655aaa
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76 am: d89cacb7bf
...
am: 3977adb530
2018-04-09 19:25:19 -07:00
Ray Essick
3e37bc925d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc am: 56927e7cae
...
am: 6e3df95a86
2018-04-09 19:21:56 -07:00
Ray Essick
135f60ffa5
Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev am: 73a2c644b7
...
am: 9c147bd5d7
2018-04-09 19:18:11 -07:00
Ray Essick
e18b64e07f
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed am: 14e18f9179
...
am: 213fa5b1db
2018-04-09 19:17:52 -07:00
Ray Essick
7f8a0e9860
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784 am: 0c883452f2 am: aa7ce42421 am: 749e2c39a0 -s ours
...
am: 2001900f59
2018-04-09 19:14:40 -07:00
Ray Essick
33586ec7c3
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf am: 591f6ccb9c
...
am: bff76d3a93
2018-04-09 19:14:36 -07:00
Ray Essick
6cc16da2a9
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc am: 10bed1ef52
...
am: 255cbbc39c
2018-04-09 19:11:42 -07:00
Ray Essick
e6af30cb2c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6 am: 06c461a30b
...
am: 205a892ff5
2018-04-09 19:08:45 -07:00
Ray Essick
a2c9539bfc
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796 am: 72405a1736
...
am: 8101a1ba85
2018-04-09 19:06:17 -07:00
Ray Essick
6c3717661f
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968 am: 66ef84dac4
...
am: 089012397b
2018-04-09 19:03:03 -07:00
