Commit Graph

43742 Commits

Author SHA1 Message Date
Lucas Lin
3647c01f40 [automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours am: 63f7b0c405 -s ours
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 b63f479a02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I4d3936f7c5b8376cedce975da5130826974fa0a4
2021-06-18 03:14:57 +00:00
Lucas Lin
c57546985a [automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 am: 7d409ae0c5 -s ours
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I35354928257f614c7983ac4dc8610255ef3ea0d5
2021-06-18 03:14:51 +00:00
Lucas Lin
7d409ae0c5 Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I3988e8d3df6819e5ef233e8c235488a17131f1b3
2021-06-18 03:02:06 +00:00
Lucas Lin
63f7b0c405 [automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I734b02a07f5b9ab4c5602e2b0741da45ac553187
2021-06-18 03:00:41 +00:00
Lucas Lin
013cf220f0 Merge "Add a test to check if the VPN type is set or not" into sc-dev 2021-06-18 02:46:50 +00:00
Frank Li
4a64b60107 [automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours am: 8e6e5177a6 -s ours
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 f8e2e20f32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I0aa42e1b65155195a56b85af56a35053bd4b89e5
2021-06-18 02:13:27 +00:00
Frank Li
49ecb4246e [automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours am: ba2a31fab3 -s ours
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 3a48843e49 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234

Change-Id: I3794e49452a390dc3d52cc14ce192b50b2cf6084
2021-06-18 02:13:22 +00:00
Frank Li
df7cb63958 [automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 am: 93c4f4cc2d -s ours
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I12ee949cc5bc3d1a7ac34656cb1766aab6cf509a
2021-06-18 02:13:13 +00:00
Frank Li
94eb68721f [automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db am: ab46d66d0d -s ours
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234

Change-Id: Iebd51a809fe8db6822201a4e7f9d47189c94f53c
2021-06-18 02:13:07 +00:00
Frank Li
ae28ddab50 [automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours am: acddaabfff -s ours
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 b7eebde98a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: If0951965f6ef8eb9b09cfcb689e23f0ff3b344ef
2021-06-18 02:13:01 +00:00
Frank Li
c045f111c8 [automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 am: ee4006fa06 -s ours
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: Ib2b5de97323c2be0b77c4412c69f00ea0f35c500
2021-06-18 02:12:39 +00:00
Frank Li
93c4f4cc2d Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I8aa95782a699b6b711441e47adb7056a449986a3
2021-06-18 01:57:57 +00:00
Frank Li
ab46d66d0d Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234

Change-Id: Ia41376d391cdfa3444b4a46ae003d315bbfc45f9
2021-06-18 01:57:43 +00:00
Frank Li
ee4006fa06 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: I39ebd7e74d548971af7e6581ce77f32b9be82208
2021-06-18 01:57:18 +00:00
Frank Li
8e6e5177a6 [automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I545eb6070ba5ff8da9122339719041754e39be27
2021-06-18 01:56:32 +00:00
Frank Li
ba2a31fab3 [automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234

Change-Id: I9049636fee0c1d402094350ee43f80dcf7c78e57
2021-06-18 01:56:27 +00:00
Frank Li
acddaabfff [automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: I576083eea68317716d7fcd278d489e03664fbaaf
2021-06-18 01:56:02 +00:00
Frank Li
799d1c6053 Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev 2021-06-18 01:37:20 +00:00
Frank Li
9097aaf5db Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev 2021-06-18 01:37:08 +00:00
Frank Li
a9602dc5d3 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev 2021-06-18 01:36:44 +00:00
James Mattis
5df769ffed [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours am: 6b23638b99 -s ours
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 b7ca034306 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I798d6b12750270b9312cee54f1d019c05acc7689
2021-06-17 16:41:18 +00:00
James Mattis
c0101eac82 [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 am: a4e465da0b -s ours
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I9105cd250812118609f36cf8e4af9922bef04bd4
2021-06-17 16:40:58 +00:00
James Mattis
a4e465da0b Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I0f8b1a947ca6e738bc21ee2c49e2412b2f99997d
2021-06-17 16:28:42 +00:00
James Mattis
6b23638b99 [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I1183777cab37fadd8a335f66cca13e95fcaca158
2021-06-17 16:27:27 +00:00
James Mattis
24ab50b086 Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev 2021-06-17 16:08:58 +00:00
Frank Li
f8e2e20f32 Add CTS test for NetworkRequest.getCapabilities API
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
      atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Original-Change: https://android-review.googlesource.com/1717737
Merged-In: I8504caa586bdb567d42047a96029dedc67968793
Change-Id: I8504caa586bdb567d42047a96029dedc67968793
2021-06-17 13:42:34 +00:00
Frank Li
3a48843e49 Add test for ConnectivityService API isPrivateDnsBroken
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1719395
Merged-In: Ib45aa439683d48360652a91d7a0609dc82adda33
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33
2021-06-17 13:22:39 +00:00
Frank Li
b7eebde98a Add CTS test for API setLegacyExtraInfo
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
      atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Original-Change: https://android-review.googlesource.com/1719131
Merged-In: Ief14f6de0cb6913da944414f0b134eb04346425f
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
2021-06-17 13:00:57 +00:00
Lucas Lin
b63f479a02 Add a test to check if the VPN type is set or not
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1733785
Merged-In: I7ed5989ec767494c1033dc01242b32724e120c4e
Change-Id: I7ed5989ec767494c1033dc01242b32724e120c4e
2021-06-17 11:15:17 +00:00
Junyu Lai
2d20d2a184 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours am: 22a9c63234 -s ours
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 52e3fa127a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: Iec4ae32af71c8cbed57697733c88e0d7e202dba4
2021-06-17 10:52:10 +00:00
Junyu Lai
8039db731a [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours am: eb50be9103 -s ours
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 512efafd32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: Icb7cacf12d3f2000b650b7f993a4e89af46c4b07
2021-06-17 10:52:08 +00:00
Junyu Lai
54bb7c9ed6 [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours am: c0b2c8af16 -s ours
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 e5bdc06735 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: Ib65c0bff5a07638e9335b02dc2494f7e3d6a6176
2021-06-17 10:52:06 +00:00
Junyu Lai
d0cf322b25 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a am: 00b03beb31 -s ours
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: I8f8c94bc99b5f25cc26f7558c2ed2aac173461cd
2021-06-17 10:51:46 +00:00
Junyu Lai
248c22422b [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 am: d576a4d0a9 -s ours
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 eb5451dd35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: I5890c0a9e6c8815f7e3fa3ba21997cb91269152e
2021-06-17 10:51:44 +00:00
Junyu Lai
3b29071c8b [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 am: 1fefd7f674 -s ours
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 32634e9da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: I7ef8f4b3914af24f0638c20439586deb7969d45b
2021-06-17 10:51:42 +00:00
Automerger Merge Worker
fe7fc9001c Merge "[automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours am: 231c832781 -s ours" into sc-v2-dev-plus-aosp 2021-06-17 10:51:36 +00:00
lifr
40ff954a29 [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours am: 231c832781 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I0e2e7ccfa2da3394ddc3140dc2790cb10a3770d1
2021-06-17 10:51:33 +00:00
lifr
be207443db [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 am: 396c9afb65 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I053df5078bfe543d41d21b1c2cc93a218ad9a622
2021-06-17 10:51:29 +00:00
Junyu Lai
00b03beb31 Fix expectCallback does not fail when no callback received am: 52e3fa127a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: Icd7743a03627382bf797b859b48b02bbee635b1f
2021-06-17 10:40:09 +00:00
Junyu Lai
d576a4d0a9 Add CTS for registerBestMatchingNetworkCallback am: 512efafd32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: I975a03a391d09787975a9572aa097b47709f817e
2021-06-17 10:40:07 +00:00
Junyu Lai
1fefd7f674 No-op refactoring of NetworkAgentTest am: e5bdc06735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: Id039d9285e4c7aefd59a75be68ff5a2f039e260c
2021-06-17 10:40:05 +00:00
lifr
396c9afb65 Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I15d0567cae9f26c276377a60c73732d91264f818
2021-06-17 10:39:43 +00:00
Junyu Lai
22a9c63234 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: Ia68e6a38b5120379129d206524202ffe1d7f918e
2021-06-17 10:39:09 +00:00
Junyu Lai
eb50be9103 [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 eb5451dd35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: I50a026db782a305e24694e65d05c0d0d320cdbdc
2021-06-17 10:39:07 +00:00
Junyu Lai
c0b2c8af16 [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 32634e9da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: If977ed563125b0d9f4afe0757d951c500d2366eb
2021-06-17 10:39:05 +00:00
lifr
231c832781 [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I91acbe710c9ed4869dae08a31f38722d2766655e
2021-06-17 10:38:51 +00:00
Junyu Lai
52e3fa127a Fix expectCallback does not fail when no callback received
This hides 3 bugs where,
  1. In Android S, onNetworkRequested is no longer broadcasted
     by ConnectivityService in any condition. However, the test
     still passes since assertion does not fail when no callback
     received. Ignore the test on S+ devices since the behavior
     changed on S or later devices.
  2. Test network agent is not registered, but the test still
     passes.
  3. Test network agent does not fulfill the request that kept
     the network up, so the test fails since the test network
     is not needed and be torn down.

Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Merged-In: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
Change-Id: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
  (cherry-picked from aosp/1731450)
2021-06-17 09:03:11 +00:00
Junyu Lai
512efafd32 Add CTS for registerBestMatchingNetworkCallback
Bug: 188657173
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest \
      CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Merged-In: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
Change-Id: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
  (cherry-picked from aosp/1727824)
2021-06-17 09:02:17 +00:00
Junyu Lai
e5bdc06735 No-op refactoring of NetworkAgentTest
This is a no-op refactoring of NetworkAgentTest, which makes
the create*NetworkAgent helper functions easier to use, this
includes:
  1. Rename "name" field to specifier, since it is the only
     purpose of that field.
  2. Make the callback generated with agent dedicated to the
     agent by adding specifier to support multiple agent cases.
  3. Refactor some code flow to for readability and less
     duplicated code.

Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      --rerun-until-failure 100
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188657173
Merged-In: Id7948d218b78ae0abf253ca8925e787362ac463f
Change-Id: Id7948d218b78ae0abf253ca8925e787362ac463f
  (cherry-picked from aosp/1727823)
2021-06-17 09:01:09 +00:00
lifr
42096be0c6 Add CTS test for NetworkAgent/NetworkAgentConfig API
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Merged-In: Ia67b963b8e18af8440b1b9bd91f53439848bb838
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
  (cherry-picked from aosp/1693668)
2021-06-17 09:00:30 +00:00