Commit Graph

5384 Commits

Author SHA1 Message Date
Automerger Merge Worker
b97181a899 Merge "[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a -s ours" into rvc-d1-dev-plus-aosp 2020-06-04 07:34:44 +00:00
TreeHugger Robot
2d2d07d883 [automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a -s ours
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922

Change-Id: I689a6ec8630165c2d85bb1bf0a31e3c8a803f4fd
2020-06-04 07:34:35 +00:00
TreeHugger Robot
5b428fc11e [automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc -s ours am: 64dc25dd63 -s ours
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922

Change-Id: I2936078f9c3249b1cc987886a72b0f394c44dffe
2020-06-04 07:34:28 +00:00
TreeHugger Robot
daec61776a Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922

Change-Id: Ia662ab3b2f4f06f803bfc75d74662c6d39a1174c
2020-06-04 07:21:07 +00:00
TreeHugger Robot
64dc25dd63 [automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc -s ours
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922

Change-Id: I992c18a39392dd332996fb946716e240f70188d7
2020-06-04 07:21:04 +00:00
Treehugger Robot
d1c80d7e20 Fix CtsNetUtils connectTo/disconnectFromWifi
connectToWifi needs to clear the wifi networks blacklist before calling
reconnect(), otherwise wifi may not reconnect if the previous network
was blacklisted.

disconnectFromWifi should not wait for a onLost callback if wifi was
already disconnected.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Test: atest CtsNetApi23TestCases
Bug: 150949391
Original-Change: https://android-review.googlesource.com/1322428
Merged-In: I244b91bdd8708694fce9f10d92b8b6646d28188f
Change-Id: I244b91bdd8708694fce9f10d92b8b6646d28188f
2020-06-04 03:08:34 +00:00
Treehugger Robot
f723371c6c Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653 am: 29f0b1fc74
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428

Change-Id: Iaca0686531b18ef4f8961803d3ab6548ccc7f433
2020-06-03 08:08:50 +00:00
Treehugger Robot
29f0b1fc74 Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428

Change-Id: I09fe2f6d4ef6a20985cf662a616a2270002a4534
2020-06-03 07:54:49 +00:00
Treehugger Robot
fce5f45653 Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428

Change-Id: I0483ab9f30828c328be8d8edb2a12234a156f5f9
2020-06-03 07:42:11 +00:00
Treehugger Robot
d99c455167 Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" 2020-06-03 07:21:49 +00:00
Remi NGUYEN VAN
7deca3e618 Fix CtsNetUtils connectTo/disconnectFromWifi
connectToWifi needs to clear the wifi networks blacklist before calling
reconnect(), otherwise wifi may not reconnect if the previous network
was blacklisted.

disconnectFromWifi should not wait for a onLost callback if wifi was
already disconnected.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Test: atest CtsNetApi23TestCases
Bug: 150949391
Change-Id: I244b91bdd8708694fce9f10d92b8b6646d28188f
2020-06-03 15:05:25 +09:00
TreeHugger Robot
75515f98a8 [automerger skipped] Merge "Skip Ikev2VpnTest on Q" into rvc-dev am: b4c27a20b3 -s ours am: fd3669f2d6 -s ours
am skip reason: Change-Id I51ded6e967291c110ff0bbd18a3631ab9a742e74 with SHA-1 2bc22844e8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702976

Change-Id: Icf0d14572f19b9905ed64560a46ccae95e5608cd
2020-06-03 04:05:43 +00:00
TreeHugger Robot
7c05af1902 [automerger skipped] Merge "Skip Ikev2VpnTest on Q" into rvc-dev am: b4c27a20b3 am: 03d54f2cab -s ours
am skip reason: Change-Id I51ded6e967291c110ff0bbd18a3631ab9a742e74 with SHA-1 539bfc16ee is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702976

Change-Id: I9c36282c3f8e8671282753ce264c4ac970133b7a
2020-06-03 04:05:18 +00:00
Automerger Merge Worker
baa12796d3 Merge "[automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 am: f61ff3be56 -s ours" into rvc-d1-dev-plus-aosp 2020-06-03 04:04:53 +00:00
TreeHugger Robot
de7a81b90a [automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 am: f61ff3be56 -s ours
am skip reason: Change-Id I6691a07ef8d6c63e68cb78813a5e3e499ef897df with SHA-1 eef04c75ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702977

Change-Id: I097a7e8b1b2966d213455ae5394c7a9e585fd534
2020-06-03 04:04:48 +00:00
TreeHugger Robot
8592680933 [automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 -s ours am: 846a33b3ee -s ours
am skip reason: Change-Id I6691a07ef8d6c63e68cb78813a5e3e499ef897df with SHA-1 eef04c75ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702977

Change-Id: I4a9612f244ef820bcd787fcec211c60cac0a3771
2020-06-03 04:04:45 +00:00
TreeHugger Robot
03d54f2cab Merge "Skip Ikev2VpnTest on Q" into rvc-dev am: b4c27a20b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702976

Change-Id: Ic495a011644628f2be79361b804cd05cd1130d85
2020-06-03 03:53:07 +00:00
TreeHugger Robot
fd3669f2d6 [automerger skipped] Merge "Skip Ikev2VpnTest on Q" into rvc-dev am: b4c27a20b3 -s ours
am skip reason: Change-Id I51ded6e967291c110ff0bbd18a3631ab9a742e74 with SHA-1 539bfc16ee is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702976

Change-Id: I801f2c77c2613d88f4f0305bc5cc8c42a3d26b93
2020-06-03 03:53:05 +00:00
TreeHugger Robot
846a33b3ee [automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 -s ours
am skip reason: Change-Id I6691a07ef8d6c63e68cb78813a5e3e499ef897df with SHA-1 eef04c75ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702977

Change-Id: Ia94f43408c11d772f53ddfdc76ece6d61d20f9cc
2020-06-03 03:52:24 +00:00
TreeHugger Robot
f61ff3be56 Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702977

Change-Id: I9e31af3f66b8ccd221a441b04c35d8a79c214270
2020-06-03 03:52:02 +00:00
TreeHugger Robot
b4c27a20b3 Merge "Skip Ikev2VpnTest on Q" into rvc-dev 2020-06-03 03:34:31 +00:00
Treehugger Robot
6566ca3d0a Remove dependency on kotlin-reflect
While local runs pass, kotlin-reflect.jar is not found on the test
infrastructure. Depending on that library does not make the test much
more simple.

Bug: 156062304
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalApiTest
Original-Change: https://android-review.googlesource.com/1322415
Merged-In: I6691a07ef8d6c63e68cb78813a5e3e499ef897df
Change-Id: I6691a07ef8d6c63e68cb78813a5e3e499ef897df
2020-06-03 02:07:21 +00:00
Remi NGUYEN VAN
2bc22844e8 Skip Ikev2VpnTest on Q
The Ikev2 VPN feature was introduced in R.

Bug: 150904735
Test: atest CtsNetTestCasesLatestSdk:Ikev2VpnTest
Original-Change: https://android-review.googlesource.com/1322414
Merged-In: I51ded6e967291c110ff0bbd18a3631ab9a742e74
Change-Id: I51ded6e967291c110ff0bbd18a3631ab9a742e74
2020-06-03 02:06:59 +00:00
Treehugger Robot
9e5a9b5dec Merge "Remove dependency on kotlin-reflect" am: 9bbb79f173 am: ba1290b755 am: 251b72aab2
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322415

Change-Id: I95e99532c4a3010867adbdbe1d70486fd478ee6c
2020-06-03 00:53:04 +00:00
Remi NGUYEN VAN
32d31be64d Merge "Skip Ikev2VpnTest on Q" am: bdfc18bc1e am: 247548cc30 am: e148c20d86
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322414

Change-Id: If2eb77aa728bf09c655f56bf48a9678ba62a128c
2020-06-03 00:52:15 +00:00
Treehugger Robot
251b72aab2 Merge "Remove dependency on kotlin-reflect" am: 9bbb79f173 am: ba1290b755
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322415

Change-Id: I6313f77394046ed05d3051473fc058aaa65dacce
2020-06-03 00:38:46 +00:00
Remi NGUYEN VAN
e148c20d86 Merge "Skip Ikev2VpnTest on Q" am: bdfc18bc1e am: 247548cc30
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322414

Change-Id: Ibaca59cea43f48392c280b06a644f109e2f4bb99
2020-06-03 00:38:34 +00:00
Treehugger Robot
ba1290b755 Merge "Remove dependency on kotlin-reflect" am: 9bbb79f173
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322415

Change-Id: I7d0d10a0fbd59dea4f9dfa70081a7ce1b514a251
2020-06-03 00:25:55 +00:00
Remi NGUYEN VAN
247548cc30 Merge "Skip Ikev2VpnTest on Q" am: bdfc18bc1e
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322414

Change-Id: I3cff2faf1e67d98ad8b5406fbbd7a69ea86d46c6
2020-06-03 00:25:42 +00:00
Treehugger Robot
9bbb79f173 Merge "Remove dependency on kotlin-reflect" 2020-06-03 00:19:37 +00:00
Remi NGUYEN VAN
bdfc18bc1e Merge "Skip Ikev2VpnTest on Q" 2020-06-03 00:13:16 +00:00
TreeHugger Robot
7f2e1c9e63 [automerger skipped] Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022 -s ours am: 40daee66ba -s ours
am skip reason: Change-Id I85299841d60afba97ffcc4ae908a85e51139319b with SHA-1 caee6ff9cb is in history

Original change: undetermined

Change-Id: I48a1082b7ff201266fab48cca9d43fbddb773d66
2020-06-02 15:33:38 +00:00
TreeHugger Robot
775e3a2b2f [automerger skipped] Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022 am: 9e9f0ac4a4 -s ours
am skip reason: Change-Id I85299841d60afba97ffcc4ae908a85e51139319b with SHA-1 f74fce0d0c is in history

Original change: undetermined

Change-Id: I9797781fdc31bde3844c761ca705eb58e1d0e520
2020-06-02 15:32:47 +00:00
TreeHugger Robot
40daee66ba [automerger skipped] Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022 -s ours
am skip reason: Change-Id I85299841d60afba97ffcc4ae908a85e51139319b with SHA-1 f74fce0d0c is in history

Original change: undetermined

Change-Id: If7c505bdb571b58309abf531a17f1a7395fb284e
2020-06-02 15:22:13 +00:00
TreeHugger Robot
9e9f0ac4a4 Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022
Original change: undetermined

Change-Id: I5012aaa578b6c172f57ebc0afdf48f640fdacbfa
2020-06-02 15:22:09 +00:00
Treehugger Robot
caee6ff9cb Fix TetheringManagerTest failure when using entitlement required SIM
If run tethering cts with entitlement required SIM, the test would
failure due to no tethering upstream. Tethering would default start
with UI base entitlement check which would have interfactive UI pop
up. Tethering's upstream is blocked because entitlement UI is keep
waiting for action till timeout.
To avoid UI interaction, start tethering with silent entitlement
check.

Bug: 156714671
Test: atest CtsTetheringTest
Merged-In: I85299841d60afba97ffcc4ae908a85e51139319b
Change-Id: I85299841d60afba97ffcc4ae908a85e51139319b
2020-06-02 04:04:55 +00:00
Treehugger Robot
d6cabf44b1 Merge "Fix TetheringManagerTest failure when using entitlement required SIM" am: 1691078821 am: fbd2113de5 am: b2d14f1589
Original change: undetermined

Change-Id: Ic729c86bddd41a75538a5a80908b064e84d9bc6b
2020-06-02 03:20:45 +00:00
Treehugger Robot
b2d14f1589 Merge "Fix TetheringManagerTest failure when using entitlement required SIM" am: 1691078821 am: fbd2113de5
Original change: undetermined

Change-Id: I444f59070783f1fdf06e044bfa2a488b35a1cfdf
2020-06-02 03:07:47 +00:00
Treehugger Robot
fbd2113de5 Merge "Fix TetheringManagerTest failure when using entitlement required SIM" am: 1691078821
Original change: undetermined

Change-Id: I4c58b3803a13271dfd45103fbd32a3a8e3238aff
2020-06-02 02:51:01 +00:00
Treehugger Robot
1691078821 Merge "Fix TetheringManagerTest failure when using entitlement required SIM" 2020-06-02 02:35:43 +00:00
Remi NGUYEN VAN
eef04c75ce Remove dependency on kotlin-reflect
While local runs pass, kotlin-reflect.jar is not found on the test
infrastructure. Depending on that library does not make the test much
more simple.

Bug: 156062304
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalApiTest
Change-Id: I6691a07ef8d6c63e68cb78813a5e3e499ef897df
2020-06-02 11:01:58 +09:00
Remi NGUYEN VAN
539bfc16ee Skip Ikev2VpnTest on Q
The Ikev2 VPN feature was introduced in R.

Bug: 150904735
Test: atest CtsNetTestCasesLatestSdk:Ikev2VpnTest
Change-Id: I51ded6e967291c110ff0bbd18a3631ab9a742e74
2020-06-02 10:51:55 +09:00
Benedict Wong
0dab9c0746 [automerger skipped] Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a am: 71742ff0e2 -s ours
am skip reason: Change-Id Ic0f71df739bd9162653b5f2878e7ddc446ddde0e with SHA-1 1f0bdd40bd is in history

Change-Id: I8f04c9238ff71f023d79598bf5ae98f455d8aeb9
2020-05-30 10:17:44 +00:00
Benedict Wong
fddddfe3db [automerger skipped] Add Ikev2VpnTests including IKE negotiation. am: a68fbd80f6 am: cd35f9f1b0 -s ours
am skip reason: Change-Id Ib6635f0068200ac0172515989fbdee5c3d49e231 with SHA-1 a68fbd80f6 is in history

Change-Id: I3667940084a5411a607d8440310ba45091ea91f6
2020-05-30 10:17:39 +00:00
Benedict Wong
2c842a559b [automerger skipped] Add basic tests for IKEv2/IPsec VPNs am: bfc3ee8559 am: d7a474056b -s ours
am skip reason: Change-Id Ia5d35c32525b32be4a0dc0584630f5bb9e7f1bcb with SHA-1 bfc3ee8559 is in history

Change-Id: I387f17197287215c64ee2afa11929d1957f98dad
2020-05-30 10:17:36 +00:00
Benedict Wong
b1e47dbd82 [automerger skipped] Extract IPsec and test network utility methods am: fec419cdd6 am: 9d57979344 -s ours
am skip reason: Change-Id I9aeafa45ab515ce72a72c3de6f70fb26e32e7fd4 with SHA-1 fec419cdd6 is in history

Change-Id: I9c77322afb712338f6e4f286f8bf1ef451dc1636
2020-05-30 10:17:31 +00:00
Benedict Wong
330545a111 [automerger skipped] Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a -s ours am: 74e588f02c -s ours
am skip reason: Change-Id Ic0f71df739bd9162653b5f2878e7ddc446ddde0e with SHA-1 3d95958d01 is in history

Change-Id: I075398d3a5ac5194976364e07dcd5572ef24d727
2020-05-30 10:11:03 +00:00
Benedict Wong
71742ff0e2 Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a
Change-Id: I3f43d034bb160478b2c2f4c2d14cbc0df3d2a8cb
2020-05-30 09:59:54 +00:00
Benedict Wong
cd35f9f1b0 Add Ikev2VpnTests including IKE negotiation. am: a68fbd80f6
Change-Id: I87dab94dec67d4e7673bb7b8a87c58500c89c3b2
2020-05-30 09:59:51 +00:00
Benedict Wong
d7a474056b Add basic tests for IKEv2/IPsec VPNs am: bfc3ee8559
Change-Id: I1bde7c0228024cdc78f75d2df187f833f9fc1897
2020-05-30 09:59:48 +00:00