Commit Graph

1854 Commits

Author SHA1 Message Date
Lorenzo Colitti
8627c0eeda Merge "Mock resources used directly by LockdownVpnTracker." am: 2606d9c862
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991628

Change-Id: I2f4adda347ed2a8b6a0d108f5a71e3b6c38aaf4a
2022-02-22 02:29:39 +00:00
Lorenzo Colitti
56c59c8bd3 Merge "Mock resources used directly by LockdownVpnTracker." am: 2606d9c862
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991628

Change-Id: If06f55d875f1ec9c1049ec61ec36ae9a1338fa06
2022-02-22 02:28:59 +00:00
Lorenzo Colitti
2606d9c862 Merge "Mock resources used directly by LockdownVpnTracker." 2022-02-22 01:59:20 +00:00
Lorenzo Colitti
93a72d22a5 Mock more resources for VPNs.
These also cause ConnectivityCoverageTests to fail when built
from master and run on S. They are used in Vpn.java, not
LockdownVpnTracker.

They were not addressed in the previous CL because running this
test locally is difficult.

Test: forrest
Change-Id: I7d687338fd6bc7468b1abcae58898322554e647b
2022-02-22 10:17:09 +09:00
Lorenzo Colitti
19e6171926 Mock resources used directly by LockdownVpnTracker.
LockdownVpnTracker directly uses resources from
com.android.internal.R. This is acceptable because it's platform
code. But ConnectivityServiceTest uses the LockdownVpnTracker
built from the module source tree, and when that code fetches
resources on a previous Android release, it crashes because the
resource IDs don't exist; non-public resource IDs aren't stable.

Fix this by mocking the resources used by LockdownVpnTracker.

Test: atest ConnectivityCoverageTests
Change-Id: I239a18a38d4f1082f76f5ff1b831c15ee753bdfd
2022-02-22 10:13:24 +09:00
Maciej Żenczykowski
831ff4c5fb Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 am: 44a4bb6d45 am: 0e0a3fedd5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I528d5f9b0d9759cb05e92c3e53189ba346318930
2022-02-19 21:29:22 +00:00
Maciej Żenczykowski
0578cd6cc9 Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 am: e6fd9ce504 am: 2668a2fb7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I773eb4a44cb86016cb79ce4da2df48db6976a6b0
2022-02-19 21:29:20 +00:00
Maciej Żenczykowski
44a4bb6d45 Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I50f114e07afb4ea84d5ca4c4623f79940f5d8703
2022-02-19 20:42:21 +00:00
Maciej Żenczykowski
e6fd9ce504 Merge "Add tests for deleteKernelTagData" am: 8bf31e8061
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I63927a2cf20ba448ff316ffd01bc409ff8b6a28b
2022-02-19 20:42:17 +00:00
Maciej Żenczykowski
a969e7eadd Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I5de3ecb76ce3b4c745c39c4486ba75f2ca9c046e
2022-02-19 20:42:07 +00:00
Maciej Żenczykowski
d012f2948b Merge "Add tests for deleteKernelTagData" am: 8bf31e8061
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I0d0d4aa20d8349b9b9afd5aea38e16f2ed6cabc7
2022-02-19 20:42:05 +00:00
Maciej Żenczykowski
fc67ee8c71 Merge "Skip NetworkStatsServiceTest before T" 2022-02-19 20:20:24 +00:00
Chalard Jean
a14b3f2184 Fix : recent Connectivity module with old NetworkStack module
This patch adjusts the behavior of the NetworkMonitor mock
to behave the same way as the real one – accept either
notifyNetworkConnected or notifyNetworkConnectedParcel as
a signal a network is connected. This is necessary because
the Connectivity module will call either of these depending
on versions of other software it finds on the device.

Test: ConnectivityServiceTest
      NetworkMonitorTest
Change-Id: I5900a019b3b033f4365d8a82b1e522336012064e
2022-02-19 20:43:14 +09:00
Lorenzo Colitti
c6d3f3cf25 Use MessageUtils instead of hardcoded strings in policyNameOf.
This makes the code easier to maintain because we do not need to
manually add string representations, and because it will throw at
static initialization time if the clas contains duplicate
POLICY_xxx values. The memory overhead is likely negligible.

Bug: 216567577
Test: new coverage in FullScoreTest
Change-Id: Iab23d414c8e28ff7f26060ad44fa996f277d361f
2022-02-19 19:45:43 +09:00
Patrick Rohr
e3b067f523 Skip NetworkStatsServiceTest before T
NetworkStatsService was mainlined in T, so the test does not need to be
run on previous Android versions.

Test: atest CtsNetTestCases:NetworkStatsServiceTest
Change-Id: I8e69746a03ef029b1121cc8fa71e299ac12c2905
2022-02-18 09:18:20 +01:00
Patrick Rohr
0bdf717793 Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 am: a0f346958f am: a87634a8b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: I1974744d7b8993db44733f524811876b78c9007a
2022-02-16 21:22:45 +00:00
Patrick Rohr
d496e9f60e Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: If41fe23391b30992b12b8b37593442e2f6cb1906
2022-02-16 20:35:24 +00:00
Patrick Rohr
a0f346958f Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: I26bc260ae6727e4e7d1a6053851681e0cee48631
2022-02-16 20:35:23 +00:00
Patrick Rohr
f9888898e3 Add tests for deleteKernelTagData
Test: atest NetworkStatsServiceTest
Change-Id: I6db6b79314868271f877acf2a0b21699cbf02df5
2022-02-16 14:23:30 +08:00
Patrick Rohr
7c52b69b3e Fix NetworkStatsServiceTest after adding deleteKernelTagData
Test: atest NetworkStatsServiceTest
Change-Id: I667a5d86e0df8505fef549e598f3b4141637fb90
2022-02-16 14:01:29 +08:00
Xin Li
bfa7b1a197 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:31:19 +00:00
Treehugger Robot
43b566d4da Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4 am: 6973f87392
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649

Change-Id: Ia75e4ba89e54d72e24a4ce1f416ccfc2f3521d13
2022-02-11 09:53:27 +00:00
Treehugger Robot
6973f87392 Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649

Change-Id: Ibeb9c3e828cc4bd3177ccfc5ef09d80155ed4781
2022-02-11 09:33:53 +00:00
Treehugger Robot
5be94579d4 Merge "Refer to SDK constant defined in DevSdkIgnoreRule" 2022-02-11 09:23:02 +00:00
Chiachang Wang
137bbed860 Refer to SDK constant defined in DevSdkIgnoreRule
Refer to the same constant definition as other tests instead of
hard coding locally, so that it won't be missed as changing to
Build.VERSION_CODES.SC_V2.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3c17c414d830af03e2719c5dab1a664c55f6df2a
2022-02-11 07:40:58 +00:00
Xin Li
a459e6a12d Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I5894450f3089b2ea105722a18ddf8f1eed1c28a0
Change-Id: If2045705da821c90705f7dd1e6944c0bb92e3289
2022-02-11 06:57:49 +00:00
Frank Li
9fd3ef39af Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field" 2022-02-11 06:19:49 +00:00
lifr
1f788606a0 [SUBID01-1]Grow NetworkIdentity to include a new mSubId field
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I8549b11d0fcfc5a9426724d6b90de27b707cb77c
2022-02-10 22:51:56 +08:00
Robert Horvath
18499f63b2 Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992 am: e5dd237590
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392

Change-Id: I49a4825750040d8a4b67db9222f2e4f3131f564b
2022-02-10 11:54:25 +00:00
Robert Horvath
e5dd237590 Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392

Change-Id: I42140d6ea97cec4899a6299373942ed8950e3f52
2022-02-10 11:30:34 +00:00
Robert Horvath
3a33495992 Merge "Add Low Power Standby test to NetworkManagementServiceTest" 2022-02-10 11:17:44 +00:00
Chiachang Wang
5ea7f1eb32 Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: If7d654a347b562859389a171c1d36b82580f2038
2022-02-10 01:39:12 +00:00
Chiachang Wang
c1ae7a1047 Merge "Change naming of excludeLocalRoutes" am: 84ad04f768
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: Ib30cc33600acea119f68989287a1dbac5c63380f
2022-02-10 01:04:20 +00:00
Chiachang Wang
84ad04f768 Merge "Change naming of excludeLocalRoutes" 2022-02-10 00:50:30 +00:00
Patrick Rohr
e5e904ee28 Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314
2022-02-09 18:33:22 +00:00
Patrick Rohr
4eeea56e39 Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I25ed7de950778a281bca5afd842126fccad3c7e0
2022-02-09 18:16:08 +00:00
Patrick Rohr
6b5b7b40d8 Merge changes from topic "bandwidth-limiting"
* changes:
  Add bandwidth limiting to CS
  Add setting that controls network rate limit
2022-02-09 18:00:04 +00:00
Jean Chalard
d0c9e13ab2 Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa am: 33235c723e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860

Change-Id: I38dca22cff766fbe3cd458d6ee1ea706c549ace2
2022-02-09 17:28:16 +00:00
Jean Chalard
33235c723e Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860

Change-Id: I632b38bacd43ce03b95a163b4742b1a414b79012
2022-02-09 17:12:02 +00:00
Patrick Rohr
2857ac4dd0 Add bandwidth limiting to CS
Adds ingress rate limiting functionality to ConnectivityService. The tc
rate limit is installed before we tell netd about the interface, and
removed after the network is removed from netd. When the setting
changes, the old rate limit needs to be removed before a new one can be
added (unfortunately, we cannot use NLM_F_REPLACE when configuring the
tc-police filter).

Currently, this functionality is always enabled, but may or may not work
based on kernel support.

Bug: 157552970
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I4e64b2c40490f061e42b40a1b1b3a6618c3d1a87
2022-02-09 14:46:26 +01:00
Aaron Huang
addfdf5d7e Merge changes Ie000244a,I3a55bc74
* changes:
  Add test for NetworkTemplate.Builder#setRoaming(int)
  Add NetworkTemplateTest to common test for cts coverage
2022-02-09 12:15:59 +00:00
Junyu Lai
b125c6f974 Merge "[MS83] Add Cts for NetworkStatsCollection/History builders" 2022-02-09 11:50:16 +00:00
junyulai
86fd7ea636 [MS83] Add Cts for NetworkStatsCollection/History builders
Test: 1. atest CtsNetTestCases:android.net.netstats.NetworkStatsHistoryTest
 2. atest CtsNetTestCases:android.net.netstats.NetworkStatsCollectionTest
 3. atest FrameworksNetTests
Ignore-AOSP-First: Required API is not in downstream yet
Bug: 218441356
Change-Id: If3d45325623cad987aab35f89c55f84042271adf
2022-02-09 17:18:19 +08:00
Frank Li
3fc00212d7 Merge "[MS68.4] Address comments at aosp/1958144" 2022-02-09 08:08:00 +00:00
Chiachang Wang
f890874970 Change naming of excludeLocalRoutes
Address API review feedback to change naming of
setExcludedLocalRoutesVpn and getter.

Bug: 217742354
Test: atest FrameworksNetTests
Change-Id: I57bbf55c7aba1c86ec8687d2431a50b37e63c6d0
2022-02-09 15:50:06 +08:00
Aaron Huang
d97e5a42d4 Add NetworkTemplateTest to common test for cts coverage
Test for NetworkTemplate.Builder

Ignore-AOSP-First: Required API is not in downstream yet
Bug: 215435701
Test: CtsNetTestCases
Change-Id: I3a55bc74388fa34a142abec308b67b185641c460
2022-02-09 14:58:15 +08:00
Jean Chalard
1fdf2c9664 Merge "Add and implement API for VpnManagers to request validation" am: 4b66d4e244
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962981

Change-Id: I44774bd346326e827227ed06428df526d1491ca3
2022-02-09 06:21:00 +00:00
Chalard Jean
d490072cd6 Pass the NetworkAgentConfig to NetworkMonitor.
When the network is a VPN, NetworkMonitor needs to know whether
the VPN requests validation, and that information is stored in
NetworkAgentConfig. Pass it.

Test: FrameworksNetTests
Change-Id: I3616f0796b69ce054d92213aafdef43ba7041596
2022-02-09 15:19:38 +09:00
Chiachang Wang
865511a8c4 Add and implement API for VpnManagers to request validation
This adds a new API that lets VPN apps using VpnManager request
that the platform run its basic validation check on the resulting
network.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I00092eee857d3e33529b19461cfd5dd060a0fe20
2022-02-08 22:47:26 +09:00
Frank
21d9760250 [MS68.4] Address comments at aosp/1958144
Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222
Ignore-AOSP-First: merge conflict
Change-Id: I2578e13e2844591adac1d1902f2454ec7079ceea
2022-02-08 16:23:51 +08:00