Commit Graph

5916 Commits

Author SHA1 Message Date
Cody Kesting
cc1bf75970 Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd am: f30e887ac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340

Change-Id: I95e4cfe2aba6d513139a73f96a7e3ca7f17715ba
2020-06-22 17:06:28 +00:00
Cody Kesting
f30e887ac6 Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340

Change-Id: Idb0298741187f16ef24491a877d449ebd41d0dae
2020-06-22 16:53:36 +00:00
Cody Kesting
c60ca1afda resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384
Bug: 148032944
Bug: 151332031
Change-Id: I7cc024249afb59631820819fed62c2417ffbd05e
2020-06-22 14:31:05 +00:00
TreeHugger Robot
3673374e41 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: f42e51ec45 am: 076b296567
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

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

Change-Id: I90c9cbc094874b6b22655fe9ec5338f79e31b6b4
2020-06-22 13:30:19 +00:00
TreeHugger Robot
6af0878b00 Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 9f801155e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: I437836e039e52460d0078647febcaed4f8c2f37f
2020-06-22 13:29:59 +00:00
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
Lorenzo Colitti
9e491121c5 Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." am: c7f94d5052
Original change: https://android-review.googlesource.com/c/platform/cts/+/1316384

Change-Id: If5630e02b0ae9a15976c0d21fe48eb4a88f53cf6
2020-06-22 04:55:45 +00:00
Lorenzo Colitti
c7f94d5052 Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." 2020-06-22 04:41:43 +00:00
Automerger Merge Worker
188828ecfc Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 22ba88d1a1" into rvc-qpr-dev-plus-aosp 2020-06-19 01:41:35 +00:00
Remi NGUYEN VAN
a6dfb3d2de Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 22ba88d1a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

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

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

Change-Id: I452192b76819b63b4c90b43cdb89452209acba7e
2020-06-19 01:40:35 +00: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
ffaf875560 Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 4c9d7be2ad am: 7496ceee69
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

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

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

Change-Id: I0c67472d30188603ac0942411ad95c394cf24afd
2020-06-18 15:18:50 +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
8f39f34637 [automerger skipped] Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d am: 01efa3f7ed -s ours am: 4dc2109434 -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: I06922252f91c6e56d1712ad316f8434f376a6b34
2020-06-18 14:56:19 +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
5cd251ba4a Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 946b09bb5c am: 19ed0f05f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010

Change-Id: I064cde8ea8e3738ad7b89f5060de8e30b3c585ed
2020-06-18 11:04:23 +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
784a0b55cf Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de am: 286a433d78 am: 7cd874fe2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000

Change-Id: I8ea26a6b773ee7db4dac376ac09b32854d239b74
2020-06-18 07:03:35 +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
Cody Kesting
7d1159a2d4 CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker.
This change adds a CTS test for ConnectivityDiagnostics using
CarrierPrivilegesTracker to receive permissions for
ConnectivityDiagnostics callbacks.

Specifically, the test provides CarrierPrivileges to the test package
(android.net.cts) for the active subscription via Carrier Configs
overrides. CarrierPrivilegesTracker listens to the Carrier Configs
change and matches the loaded certificate with the test package, then
includes the test package UID as an administrator for the Network in
ConnectivityService. Then, a ConnectivityDiagnosticsCallback is
registered and receives a ConnectivityReport on register for the active
subscription.

Bug: 148032944
Bug: 151332031
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: Iee8a428ada0b6e2127410267a13c3b688df83e6d
2020-06-17 10:38:48 -07:00
TreeHugger Robot
524f8f05b9 [automerger skipped] Merge "Verify owner of IKEv2 VPNs" into rvc-dev am: 8badddb04d -s ours am: 5ec4c0ebce -s ours am: 0fb16e2931 -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: I27a8838e14e11295826fb22e203a74137e214d89
2020-06-17 16:07:09 +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
63eb931f6d [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours am: 1e1e07e884 -s ours am: 16f9ef4fca -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: I95e97ee740f3862e42f6f4ef0b2c01afd770210e
2020-06-16 09:48:18 +00:00
TreeHugger Robot
14f9ea6b2c [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 am: 0a6db8a062 -s ours am: 69be16212d -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: I0d8bfca295b67ea7f4dd0d1d6b0b2f28b8beca7a
2020-06-16 09:47:16 +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