Commit Graph

5501 Commits

Author SHA1 Message Date
TreeHugger Robot
076b296567 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: f42e51ec45
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: I35067f222e3c4661d7e765af2cf531307137f398
2020-06-22 13:15:20 +00:00
TreeHugger Robot
1ba1f9e9b6 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: Ib51c3d6b36f04c09e6015a30abd9d2a0b86f56ed
2020-06-22 13:14:53 +00:00
TreeHugger Robot
f42e51ec45 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: I5e0a161d7fd5af4f9d097189674727e2a8a4baa2
2020-06-22 12:56:31 +00:00
TreeHugger Robot
1b1f4cc178 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: If5c79e058e7a12ad28bb7ad7f0a8e279c3ed78e9
2020-06-22 12:56:18 +00:00
Luke Huang
6261d27a9f Add net-utils-framework-common to cts-net
In order to avoid class package missing problem, add
net-utils-framework-common in cts net test build. Also jarjar
the package name to prevent conflict.

Test: build
Test: atest DnsResolverTest
Bug: 150952393
Change-Id: I40e2d4c4945a0579f6e1923e4722b09354ff050c
2020-06-22 15:08:27 +08:00
Remi NGUYEN VAN
22ba88d1a1 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

Change-Id: Id50a52d4f1bbaf6a3970439b703098ddf31cbbe7
2020-06-19 01:22:47 +00:00
Remi NGUYEN VAN
d5f741e7af Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: fd265a7858
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

Change-Id: I826f5cff1850164e495b16ae984bac8b1777a355
2020-06-19 01:22:28 +00:00
Remi NGUYEN VAN
fd265a7858 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

Change-Id: I773c676203488e9a323fa6a5b6c78e2006031fa0
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
6f26750be6 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

Change-Id: I82f049b2eba1562ae2d70cb584429cbce07c4fdf
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
a530216c7d Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev 2020-06-19 00:49:29 +00:00
Lorenzo Colitti
7496ceee69 Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 4c9d7be2ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

Change-Id: I437ed18ca1aaa220193e89a0a734292d31c852d1
2020-06-18 15:02:30 +00:00
Cody Kesting
72a7f5b3c9 Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de am: d155cba9da
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000

Change-Id: I51d1c20417741b26a1179a75d04ff9d5944d3d21
2020-06-18 15:01:01 +00:00
Lorenzo Colitti
4c9d7be2ad Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

Change-Id: Id574cdad65e4e4845e20d529571399e9b5ee066e
2020-06-18 14:58:19 +00:00
Cody Kesting
d155cba9da Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000

Change-Id: I7d572ab754773dcbd32475b241060fba898308c8
2020-06-18 14:56:24 +00:00
TreeHugger Robot
4dc2109434 [automerger skipped] Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d am: 01efa3f7ed -s ours
am skip reason: Change-Id Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26 with SHA-1 21bf8ba8e7 is in history

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

Change-Id: I4883224bf2d8c6a10ee68e81d5b8bbe204134860
2020-06-18 14:38:58 +00:00
TreeHugger Robot
01efa3f7ed Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11876501

Change-Id: I061844c9a856979e58d9c6ab41974fcc875559c8
2020-06-18 14:34:45 +00:00
Lorenzo Colitti
19ed0f05f2 Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 946b09bb5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

Change-Id: I3327b1c9ee8c426033f5e03c90d03210a86167fd
2020-06-18 10:47:59 +00:00
Lorenzo Colitti
946b09bb5c Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

Change-Id: I166a083b41e7a7ccb5206e0c332ae0a77825f42a
2020-06-18 10:34:11 +00:00
Lorenzo Colitti
7703986e4c Merge "Update DnsPacket package name" into rvc-dev 2020-06-18 10:14:47 +00:00
Cody Kesting
7cd874fe2b Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de am: 286a433d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000

Change-Id: I578364e32d76e94546e317b8e3518574f1bcb6d6
2020-06-18 06:46:12 +00:00
Cody Kesting
286a433d78 Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000

Change-Id: Ia6830bfbb3c15fa04553433c8320eb0a79b3a299
2020-06-18 06:27:23 +00:00
Cody Kesting
7c9d2128de Only run ConnectivityDiagnosticsManagerTest as AppModeFull.
This CL restricts ConnectivityDiagnosticsManagerTest to only being run
as @AppModeFull. This is required, as Instant Apps are not allowed
CHANGE_NETWORK_STATE (required for CM#requestNetwork) or
MANAGE_TEST_NETWORKS (required for TestNetworkManager#setupTestNetwork)
permissions - both of which are required for
ConnectivityDiagnosticsManagerTest.

Bug: 158431112
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Change-Id: Id867b8dcaca758cfeb83009848e1099e900a0790
2020-06-18 13:38:00 +09:00
Luke Huang
8f3a1b5091 Update DnsPacket package name
The package name needs to be updated as
the class is moved into com.android.net.module.util.

Bug: 149403767
Test: atest DnsResolverTest
Change-Id: I908cb5f7bc6150e461748c8e34c92a19aa0206e4
2020-06-18 03:27:27 +00:00
TreeHugger Robot
0fb16e2931 [automerger skipped] Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d -s ours am: 5ec4c0ebce -s ours
am skip reason: Change-Id Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26 with SHA-1 9d1f86f3a8 is in history

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

Change-Id: Idd40c884984b155eab71eeeae8f3d20f773b6323
2020-06-17 15:48:44 +00:00
TreeHugger Robot
5ec4c0ebce [automerger skipped] Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d -s ours
am skip reason: Change-Id Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26 with SHA-1 9d1f86f3a8 is in history

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

Change-Id: I35aecabe6bfc78de6b59f04f4bba16ce78e0b15c
2020-06-17 15:35:35 +00:00
TreeHugger Robot
8badddb04d Merge "Verify owner of IKEv2 VPNs" into rvc-dev 2020-06-17 15:26:22 +00:00
TreeHugger Robot
16f9ef4fca [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours am: 1e1e07e884 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 ec38685a7f is in history

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

Change-Id: I0a0541948c74af7e76ae25fa7c8a69f45323194c
2020-06-16 09:44:47 +00:00
TreeHugger Robot
69be16212d [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 am: 0a6db8a062 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

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

Change-Id: I9eb47e31b6f740d3ee20ea0510ea1ab383d5960b
2020-06-16 09:38:22 +00:00
TreeHugger Robot
1e1e07e884 [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

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

Change-Id: I00d4a6bc63ff9489a732d404769018bd69b031bc
2020-06-16 09:25:56 +00:00
TreeHugger Robot
0a6db8a062 Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I63be8cdebe4b8ba19251600a12b02a496384fe13
2020-06-16 09:23:18 +00:00
TreeHugger Robot
3cc6da3e61 Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev 2020-06-16 09:09:17 +00:00
Treehugger Robot
ec38685a7f Toggle wifi when running CaptivePortalTest
Instead of reconnecting without disabling/re-enabling wifi in
CaptivePortalTest, actually do the toggle during the test and
on teardown to ensure that the BSSID blacklist is cleared.

CaptivePortalTest intentionally makes the network not validate, which
causes it to be added to the BSSID blacklist. Toggling wifi is necessary
to make sure the test does not affect other tests.

Also check development SDK instead of the exact SDK_INT number so that
the test can pass on current AOSP builds.

Bug: 158924461
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest \
          CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1336114
Merged-In: I31f9f4a9678e11042005c29535af840246358764
Change-Id: I31f9f4a9678e11042005c29535af840246358764
2020-06-16 16:53:25 +09:00
Benedict Wong
21bf8ba8e7 Verify owner of IKEv2 VPNs
This change adds assertions to ensure that the owner UIDs of IKEv2 VPNs
are correctly set.

Bug: 150135470
Test: This
Merged-In: Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26
Change-Id: Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26
(cherry picked from commit 30234827aa24716062a23f28b1effc59e9ef46de)
2020-06-16 01:43:34 +00:00
Treehugger Robot
73f9a5063b Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d am: 909eeeed43
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: Ie296e013b970c43ac3bd9d79be97c55b844ab49e
2020-06-16 01:29:50 +00:00
Treehugger Robot
909eeeed43 Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: Id369a526b18d70fdb72a5dcaf12092d6085efe27
2020-06-16 01:16:18 +00:00
Treehugger Robot
5f38f3067d Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: I4a878a7d328a7a001355e092b81e1e3635dcb853
2020-06-16 00:59:52 +00:00
Treehugger Robot
1ae290c1a6 Merge "Toggle wifi when running CaptivePortalTest" 2020-06-16 00:43:07 +00:00
Benedict Wong
8324c6660c Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9 am: ed0ddfc96c
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: I7a2f5903cf6e5e99f230963c932266a2147bea15
2020-06-15 17:38:17 +00:00
Benedict Wong
ed0ddfc96c Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: Ib77195b5116622e42730d1e25ed48c3fcbbeaa36
2020-06-15 17:33:32 +00:00
Automerger Merge Worker
d40742b7fb Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp 2020-06-15 17:19:05 +00:00
Yan Yan
e68a74ad49 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

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

Change-Id: Ie657ef6aca17b9af21b7eee1e3ef3df4fffeaea0
2020-06-15 17:18:59 +00:00
Yan Yan
b3bf07b6b3 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

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

Change-Id: Ic1bdae74c4307f46feae04a4de951520d436a9cf
2020-06-15 17:18:57 +00:00
Benedict Wong
7f63ec96d9 Merge "Verify owner of IKEv2 VPNs" am: a330e50192
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: Ia3e9f26c6e28fa02b25b3098fbda98c2bf07c2bf
2020-06-15 17:18:15 +00:00
Benedict Wong
a330e50192 Merge "Verify owner of IKEv2 VPNs" 2020-06-15 17:09:46 +00:00
Yan Yan
b12f23f68a Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I9a472d7fb0610439f6d753bb22f302a1d754fd50
2020-06-15 17:05:11 +00:00
Yan Yan
5cf96925d2 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

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

Change-Id: I4379b1f57e74d5cb10dbabf57c6245c73a8b7c29
2020-06-15 17:05:09 +00:00
Yan Yan
91e4a69abe Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev 2020-06-15 17:03:23 +00:00
Treehugger Robot
e7cf109b3e [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

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

Change-Id: Iee403b18ad68d5e1cb314abfc8f0e29f30fb6000
2020-06-15 13:58:50 +00:00
Treehugger Robot
cd011d8048 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

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

Change-Id: I0c9aad45309fa76f3945549ee8a1bed50d60f20f
2020-06-15 13:58:42 +00:00
Treehugger Robot
ef7d1e44ca Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ic930dd7826e5ba1169374c278dc67ea4fa799447
2020-06-15 13:47:29 +00:00