Commit Graph

2762 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
e4fa2ac5ac Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f am: 4c21d6c2a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819

Change-Id: I7f2a05be80117dad19b5e7fafb71f562466096f9
2021-06-09 09:15:06 +00:00
Remi NGUYEN VAN
4b6239c2c8 Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825

Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661
2021-06-09 09:14:57 +00:00
Remi NGUYEN VAN
4c21d6c2a6 Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819

Change-Id: Id60ce478abe26c82f79bdce0b025e9629cdd0d89
2021-06-09 08:54:47 +00:00
Remi NGUYEN VAN
98ea169c22 Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825

Change-Id: Ied36d4711c9c12d0991c00c28a78931ae3ea58f9
2021-06-09 08:54:38 +00:00
Remi NGUYEN VAN
545f6cf95f Merge "Remove ConnectivityServiceTest signature perms use" 2021-06-09 08:39:33 +00:00
Remi NGUYEN VAN
35e6108119 Merge "Use mockito-extended in FrameworksNetTests" 2021-06-09 08:39:24 +00:00
Lorenzo Colitti
7d9f43c6f3 Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c am: b4e1b65298
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829

Change-Id: Iad96cfcdd5f385c084be76b3b25ffd10b080df7f
2021-06-09 08:33:36 +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
Junyu Lai
fd242c77b1 Merge changes from topic "cts-snapshots" am: 07f97b249c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822

Change-Id: I0fc00956cc8891e45bb2b76f6e35063949d5f0ba
2021-06-09 08:16:01 +00:00
junyulai
ccebee1ece Add CTS for getAllNetworkStateSnapshots am: cfefdea403
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091

Change-Id: I8217f4e4c0de2de5f12066e567f56c0f5432d9f7
2021-06-09 08:15:58 +00:00
Lorenzo Colitti
b4e1b65298 Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829

Change-Id: I1e42216dc10552861253f719d1178e3143ac83c3
2021-06-09 08:14:54 +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
Junyu Lai
07f97b249c Merge changes from topic "cts-snapshots"
* changes:
  Add CTS for NetworkAgentConfig#setSubscriberId
  Add CTS for getAllNetworkStateSnapshots
  Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots
2021-06-09 08:09:41 +00:00
Lorenzo Colitti
a3f12dd52c Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." 2021-06-09 07:59:25 +00:00
Lorenzo Colitti
f55fa638c8 Merge "Improve test coverage for disconnecting networks with clat." 2021-06-09 07:59:13 +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
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
junyulai
cfefdea403 Add CTS for getAllNetworkStateSnapshots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots --rerun-until-failure 100
Test: atest
CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest on R
device
Bug: 188140631

Merged-In: I573b009bd05bbc0c855aaa6e20cb8ebde6729936
Change-Id: I573b009bd05bbc0c855aaa6e20cb8ebde6729936
  (cherry-picked from ag/14598438)
2021-06-09 01:34:14 +00:00
Junyu Lai
ed4ef7bb99 Add CTS for NetworkAgentConfig#setSubscriberId
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188140631
Merged-In: I90d47ac9bd0570c0aed19402fa9be4e99e0f8621
Change-Id: I90d47ac9bd0570c0aed19402fa9be4e99e0f8621
  (cherry-picked from ag/14639705)
2021-06-09 01:34:14 +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
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
Remi NGUYEN VAN
bba8ec0d43 Remove ConnectivityServiceTest signature perms use
To allow unit tests to run without platform certificates, remove
signature permission usage in ConnectivityServiceTest.

This mocks permission checks done in ConnectivityService for which the
test assumed that the permission was held, and mocks calls to
BatteryStatsManager. Calls to ActivityManagerService (through
PendingIntent) are done with shell permissions as the test uses real
PendingIntent mechanics.

Bug: 187935317
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I80c5cae5fcd3d40be55d1a79a93d614e665fbbf4
2021-06-08 19:12:13 +09:00
Remi NGUYEN VAN
98b76cc2ec Use mockito-extended in FrameworksNetTests
This is necessary to mock classes like BatteryStatsManager, which cannot
be used without signature permissions, and to merge the test with other
test suites that use mockito extended.

Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: I5dba65d806c5d06b3ff8f633846edb911a7a44ec
2021-06-08 19:12:09 +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
b4bf015b57 Don't send onLinkPropertiesChanged after onLost for 464xlat.
Currently, when a network that uses 464xlat is torn down,
NetworkCallbacks will receive onLinkPropertiesChanged after
onLost. This is confusing and incorrect.

The incorrect callback is sent because handleLinkProperties
checks that the netId of the agent still exists, not that the
NetworkAgent is still registered. This is normally correct,
because the NetworkAgent is removed from mNetworkAgentInfos and
the netId are removed from mNetworkForNetId by the same method,
disconnectAndDestroyNetwork.

In this specific case it's not correct, because the call to
handleUpdateLinkProperties is from disconnectAndDestroyNetwork
itself via nai.clatd.update and calls Nat464Xlat#stop.

No other callers of handleUpdateLinkProperties are affected
because:

- EVENT_NETWORK_PROPERTIES_CHANGED is called only by
  maybeHandleNetworkAgentMessage, which first checks that the
  NetworkAgent is registered.
- handlePrivateDnsSettingsChanged only looks at registered
  NetworkAgents (it loops over mNetworkAgentInfos).
- handlePrivateDnsValidationUpdate, handleNat64PrefixEvent and
  handleCapportApiDataUpdate call getNetworkAgentInfoForNetId,
  which will correctly determine that the agent is no longer
  registered, since they run on the handler thread and thus
  cannot run at the same time as disconnectAndDestroyNetwork.

The existing code contains a check for the netId being current.
This is intended to ensure that an update from a NetworkAgent
cannot affect another agent with the same Network. This extra
check is not necessary, because code running on the handler
thread can never observe a NetworkAgent in mNetworkAgentInfos
unless mNetworkForNetId maps that NetworkAgent's Network to that
NetworkAgent. This is because mNetworkForNetId is updated by the
same methods as mNetworkAgentInfos, and those updates occur on
the handler thread. So all code on the handler thread will see
those two as consistent.

Bug: 176496580
Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests
Change-Id: I944f4c6ad36206bdccd85a6ea7ef71324a29c685
2021-06-08 15:48:57 +09: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