Commit Graph

2781 Commits

Author SHA1 Message Date
Lorenzo Colitti
fa26e894a3 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915 am: 97adf6a8b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Ibee94710b4b84d9e2c58b49c73d94cf01a5205f1
2021-06-09 08:34:18 +00:00
Lorenzo Colitti
97adf6a8b4 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Idf372d6f3305d6678837d36ce901af8ac482ea58
2021-06-09 08:33:31 +00:00
Lorenzo Colitti
7e79954915 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Ieb08904445cabf01ed5ba6f4543699a1585fda50
2021-06-09 08:14:44 +00:00
Lorenzo Colitti
f55fa638c8 Merge "Improve test coverage for disconnecting networks with clat." 2021-06-09 07:59:13 +00:00
Treehugger Robot
4d857e173c Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187 am: eea4b37228 am: 8c2b394c6f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162

Change-Id: Id2f5783456b677af441eb73555fba932035d69f3
2021-06-09 06:38:54 +00:00
Treehugger Robot
8c2b394c6f Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187 am: eea4b37228
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162

Change-Id: Iacfcb44374664b60f35f48749100dae83c54dfaf
2021-06-09 06:18:23 +00:00
Treehugger Robot
eea4b37228 Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162

Change-Id: I604e6d94640f36b37a628aa77e6df0fb709e2d85
2021-06-09 06:06:13 +00:00
Treehugger Robot
0103375187 Merge "Fix restorePrivateDnsSetting with null hostnames" 2021-06-09 05:45:24 +00:00
Yan Yan
d436db2a20 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097 am: 64828e9ff3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: I6506025ab2499cd582cee6b3dfbf1bd218ac3196
2021-06-09 02:13:39 +00:00
Yan Yan
64828e9ff3 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: Ie5bc0407bcf43d5186cde53599bd4318b3c4be25
2021-06-09 01:57:25 +00:00
Remi NGUYEN VAN
99fadb7b70 Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729164

Change-Id: I0a14a5fc335b46a5fd61c126e3107898253d097f
2021-06-09 01:20:24 +00:00
Remi NGUYEN VAN
0dcbcff1d6 Add framework-connectivity-test-defaults am: 3912c80e99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729165

Change-Id: Id17a3ba31f955f4533731cbc3dda23d07c06bb0b
2021-06-09 01:20:17 +00:00
Remi NGUYEN VAN
de3c20ecb5 Merge changes from topic "conn_test_defaults_cp"
* changes:
  Move connectivity test defaults to tests/common
  Add framework-connectivity-test-defaults
2021-06-09 00:59:17 +00:00
Junyu Lai
9575dbbb81 Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726731

Change-Id: I0f4598c353cb7dba7f0583a3103481d298e45b5c
2021-06-08 23:10:17 +00:00
Chalard Jean
50c26d75f0 Enable policy ranking am: f4c48a4d5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727818

Change-Id: I458b430aac9d633099787863bcc252ffd236725a
2021-06-08 23:10:14 +00:00
junyulai
682ab81490 Add CTS to verify NetworkAgent#setLingerDuration am: a95eef727e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1654011

Change-Id: I257454c0429cf454ef23617ad39ef1a9711fd44a
2021-06-08 23:10:11 +00:00
Chalard Jean
d413b74023 Allow network providers to set the linger duration. am: 550b5214d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727821

Change-Id: I2a9872dc3da0e89574ae5bab28dfd3bb4c3f3abf
2021-06-08 23:10:08 +00:00
junyulai
602d75b22b Fix nascent timer never get removed am: 36c02987c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727820

Change-Id: I706b0a9cff0d9e4a18c62143732b067ef63505b8
2021-06-08 23:10:04 +00:00
Chalard Jean
6a529e1a7a [NS13] Remove the last usage of the legacy int am: c81d4c3c7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727817

Change-Id: I58b48e44563e52d1cce3aa604be148bbadb1fb9f
2021-06-08 23:10:01 +00:00
Chalard Jean
22acfab1bc [NS11] Fix yieldToBadWifi over the policy scoring am: 142f0fe4d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727812

Change-Id: Ie216a888a6effcf285468e063b66d04f18b8b7c7
2021-06-08 23:09:46 +00:00
Yan Yan
4d50a5f097 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: I59255aaea77c826accc2198ca7f01fca4b57c93f
2021-06-08 22:53:14 +00:00
Junyu Lai
5b15e700bb Merge changes from topics "enable-policy-ranking", "sendNetworkScore"
* changes:
  Adjust a test for policy scoring
  Enable policy ranking
  Add CTS to verify NetworkAgent#setLingerDuration
  Allow network providers to set the linger duration.
  Fix nascent timer never get removed
  [NS13] Remove the last usage of the legacy int
  Add documentation
  Use filter from CollectionUtils.
  Fix a bug where updates of offers won't find existing offers
  [NS12] Address comments on NS09
  [NS11] Fix yieldToBadWifi over the policy scoring
  Add doc for NetworkScore#getLegacyInt
  Expose sendNetworkScore that takes a NetworkScore
2021-06-08 22:34:44 +00:00
Yan Yan
77f2e95515 Merge changes I00d1aa47,Icffbe67f
* changes:
  Add CTS for AES-CMAC
  Add tests for new IPsec algorithms in IpSecManagerTest
2021-06-08 22:30:16 +00:00
Frank Li
5d32bb6c5d Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf am: 1cccc8db0e am: aacfddff03
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I7f51fd58fc330be4f78bb19d68e405ae7c402b69
2021-06-08 11:58:10 +00:00
Frank Li
aacfddff03 Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf am: 1cccc8db0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I6ed1598065cf55021d4ffea88f3c0f21e4e4ff64
2021-06-08 11:42:35 +00:00
Frank Li
1cccc8db0e Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I2cab45cff92215389eb6bba7b14270e3329d600d
2021-06-08 11:28:34 +00:00
Frank Li
3103a318bf Merge "Add CTS test for API setLegacyExtraInfo" 2021-06-08 11:15:06 +00:00
Remi NGUYEN VAN
679a8e0a72 Move connectivity test defaults to tests/common
The build file currently holds a single build rule in test/. Move it to
the existing build file in tests/common/Android.bp.

(clean cherry-pick of history in downstream branch)

Test: m
Bug: 186628461
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ifa32681c0cdd2f6a70cb83a81cd7fec0f91824d1
2021-06-08 19:54:35 +09:00
Remi NGUYEN VAN
3912c80e99 Add framework-connectivity-test-defaults
The defaults follow the same pattern as framework-wifi-test-defaults to
allow unit tests to build against hidden API in Connectivity.

(clean cherry-pick of history in downstream branch)

Bug: 171540887
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ia8531f672820fcc8968f98494903e486c4e42652
2021-06-08 19:54:27 +09:00
Remi NGUYEN VAN
908b002ed2 Fix restorePrivateDnsSetting with null hostnames
When private DNS setting was set to opportunistic (mode) and null
(hostname), CtsNetUtils would not restore it.

Make sure that private DNS settings are restored after every test. Also
fail if restore is called without having saved any setting beforehand.

Bug: 190465704
Test: atest CtsNetTestCases
Change-Id: Ic5d8d8b729469e0eef89a0b53f166e604264c1ee
2021-06-08 19:29:08 +09:00
Paul Hu
997f6e9893 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092

Change-Id: Ib2e80a59085eea9decade271da3dec2b5a3e2b72
2021-06-08 07:47:06 +00:00
Paul Hu
7cba5f4163 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" 2021-06-08 07:23:39 +00:00
Lorenzo Colitti
284ca22f0c Improve test coverage for disconnecting networks with clat.
Ensure that NetworkCallbacks and netd operations are accounted
for. Also add a test for the spurious onLinkPropertiesChanged
callback that is currently send out after onLost.

Bug: 176496580
Test: atest ConnectivityServiceTest
Change-Id: I69cf58bc87dfe55ea359a2cd76167d03fe2c953d
2021-06-08 15:43:17 +09:00
Paul Hu
a9d6f3c4c5 Merge "Address leftover comments" am: e2791b00d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729091

Change-Id: I97628a5e88d4410f0745c4a0b1d1bc3bef8111e5
2021-06-08 06:36:02 +00:00
Paul Hu
e2791b00d3 Merge "Address leftover comments" 2021-06-08 06:18:19 +00:00
Chalard Jean
f4c48a4d5f Enable policy ranking
Test: Passes all presubmits, been tested in labs
Bug: 184834350
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: If33884aa245bcc8817bbc9c2fdfab035249e7301
Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
  (cherry-picked from ag/14150470)
2021-06-08 00:17:38 +00:00
Chalard Jean
8c32adf149 Adjust a test for policy scoring
Bug: 184834350
Test: this
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ib161503c0e6f73c5b5017ae554bbdc28ac3edb3e
Change-Id: Ib161503c0e6f73c5b5017ae554bbdc28ac3edb3e
  (cherry-picked from ag/14272003)
2021-06-08 00:17:38 +00:00
junyulai
a95eef727e Add CTS to verify NetworkAgent#setLingerDuration
Test: this
Bug: 184227264
Fix: 184796264
Merged-In: I77818685b2bfea499c0294874d205544161677c5
Change-Id: I77818685b2bfea499c0294874d205544161677c5
  (cherry-picked from ag/14104367)
2021-06-08 00:17:37 +00:00
Chalard Jean
550b5214d3 Allow network providers to set the linger duration.
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
CTS-Coverage-Bug: 184796264
Bug: 184227264
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I7f420faa40863385114705d6971cf00887d03318
Change-Id: I7f420faa40863385114705d6971cf00887d03318
  (cherry-picked from ag/14100410)
2021-06-08 00:17:37 +00:00
junyulai
36c02987c6 Fix nascent timer never get removed
By design, the nascent timer will be removed after a network
satisfied first request. However, this never happens.
Because the mInactive is false when that happens, so isNascent
is never true.

Furthermore, when removing a nascent timer, the inactivity
state can never be updated since no condition in the
updateInactivityState will be met to update the state correctly.

Thus, update inactive state accordingly when adding/removing the
nascent timer.

Test: TH
Bug: 184227264
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I4c1521b6e0ef68ac489771a2ab6b09ef3e381577
Change-Id: I4c1521b6e0ef68ac489771a2ab6b09ef3e381577
  (cherry-picked from ag/14060609)
2021-06-08 00:17:37 +00:00
Chalard Jean
c81d4c3c7e [NS13] Remove the last usage of the legacy int
Note that this requires removing part of a test, because
that part is testing that the a 50 bonus of the legacy
int is stronger than the validation penalty, which is
not a mechanic we want to have. When WiFi is unvalidated
and cell is unvalidated, cell should be kept in case it
validates, like is described in comments in
isNetworkPotentialSatisfier ; however this test is
checking that it *IS* reaped off if the wifi score is
strong enough. This should be incorrect, and should not
be tested, so this patch removes the check.

Test: ConnectivityServiceTest
Bug: 184834350
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I8966abee59fea2d9f10f082aba87df6588b72762
Change-Id: I8966abee59fea2d9f10f082aba87df6588b72762
  (cherry-picked from ag/14127306)
2021-06-08 00:17:37 +00:00
Chalard Jean
142f0fe4d4 [NS11] Fix yieldToBadWifi over the policy scoring
This doesn't reactivate the test because it's not yet fixed over int
scoring.

Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I32477db52eb50faabc499fa68e24ba07577782aa
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
  (cherry-picked from ag/14064906)
2021-06-08 00:17:36 +00:00
Yan Yan
0891de6311 Add CTS for AES-CMAC
This commit:
  - Verify AES-CMAC is supported in device that first
      launched with SDK beyond R
  - Verify IpSecTransforms can be built with AES-CMAC and
      traffic flows

Bug: 171083832
Test: atest IpSecManagerTest
Test: AES-CMAC tests are manually enabled and verified
Change-Id: I00d1aa475033810a5f60f0e3fc692be87ff62e13
2021-06-07 15:05:57 -07:00
Yan Yan
5e692b6ca7 Add tests for new IPsec algorithms in IpSecManagerTest
This CL adds CTS tests that:
- Verify IpSecAlgorithm#getSupportedAlgorithms
- Verify new algorithms are supported in device that first
  launched with SDK beyond R
- Verify IpSecTransforms can be built with new algortihms and
  traffic flows

Since there is no hardware that first launched with SDK beyond R
at the time of writing this CL, tests for new algorithms were
manually enabled and verified on the pixel with an updated kernel.

Bug: 171083832
Test: atest IpSecManagerTest
Change-Id: Icffbe67fca29b051457dbf863ba3aaf653806a83
2021-06-07 15:01:46 -07:00
lifr
0fd78de2c6 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
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
2021-06-07 20:22:47 +00:00
Treehugger Robot
8c3dd6182b Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28 am: 0deed353b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I66d6f1f2f4004a9aa3dfa2a26fa2375581c87b80
2021-06-07 19:36:50 +00:00
Treehugger Robot
0deed353b7 Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I10a6a9c97cf7bfdde877a9d061b03990a830833c
2021-06-07 19:22:18 +00:00
Junyu Lai
aedcd7822c Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723146

Change-Id: I97b92d1249d60fca6a2c674dd296ec0b75dfd46e
2021-06-07 19:01:48 +00:00
Treehugger Robot
058e8f9f28 Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I1cd0d5563416630dac3baa769c96b40838a5e9b8
2021-06-07 19:01:19 +00:00
Junyu Lai
217f4ad9b1 Merge "[NS10] Fix a bug where registerIgnoringScore is broken" 2021-06-07 18:53:37 +00:00