Commit Graph

9919 Commits

Author SHA1 Message Date
Chiachang Wang
73a03e9ca8 Merge "Replace the usage of UidRange" am: 1241156261
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481

Change-Id: Ia6ed617c849fd8ae68874b530f108428676068e6
2021-03-18 14:01:33 +00:00
Chiachang Wang
1241156261 Merge "Replace the usage of UidRange" 2021-03-18 13:36:39 +00:00
Chalard Jean
dea6a318db Merge "Fix a bug where any() returns null" am: 3a1932cd79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139

Change-Id: Icb56bbae07dc6de85668c0a202829c92422cbb3d
2021-03-18 10:36:29 +00:00
Chalard Jean
3a1932cd79 Merge "Fix a bug where any() returns null" 2021-03-18 09:59:21 +00:00
Remi NGUYEN VAN
5916c38d92 Merge "Remove networkAttributes resource usage" am: 584cfc6b67
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708

Change-Id: I94c174ca3ee356706947f213cb05d0a47deff233
2021-03-17 11:51:17 +00:00
Remi NGUYEN VAN
584cfc6b67 Merge "Remove networkAttributes resource usage" 2021-03-17 11:24:28 +00:00
Kimberly Kreider
8266302ee7 Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141

Change-Id: I5aed0f6bfc7bbb30c5c6794431276e40a110b3a4
2021-03-17 02:47:32 +00:00
Kimberly Kreider
6f4d35119f Merge "Enable networking tests to be included in partial MTS files as well as full mts." 2021-03-17 02:23:54 +00:00
Maciej Żenczykowski
4c9bfb1fbd Merge "Test conntrack event monitor on R" am: d5f07c1243
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707

Change-Id: I669b5b66d9a538365668788e2b4d45be41718ab9
2021-03-16 13:03:43 +00:00
Chalard Jean
1705798d13 Fix a bug where any() returns null
The type needs to be specified

Test: NetworkAgentTest
Change-Id: I7128ae520cb7175f1fb9467a94edfd1a4bdeb9da
2021-03-16 21:49:29 +09:00
Maciej Żenczykowski
d5f07c1243 Merge "Test conntrack event monitor on R" 2021-03-16 12:29:20 +00:00
Hungming Chen
62afc9809b Test conntrack event monitor on R
Should not {start, stop} conntrack event monitor on R because
it is used by S feature.

Test: atest TetheringCoverageTests
Change-Id: I57a0a84d46e973660b24fc10d314820ada0d45b9
2021-03-16 18:14:38 +08:00
Treehugger Robot
de2d7bef3b Merge "Do not start conntrack event monitor when running on R" am: c162fc297f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703

Change-Id: Ib43879926b0b6789025ab2360c8dc0de1f28090f
2021-03-16 08:46:05 +00:00
Treehugger Robot
c162fc297f Merge "Do not start conntrack event monitor when running on R" 2021-03-16 08:03:46 +00:00
Remi NGUYEN VAN
f1c04fb6b3 Remove networkAttributes resource usage
Supported network types are now deduced from system features, not the
networkAttributes resource.
Update the test to expect network types to be configured as per
resources before S, and to match system features on S+.

Bug: 146206136
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: I715924d562f439f7239c1c95d2dc5bca7095a123
2021-03-16 16:54:17 +09:00
Chalard Jean
1834461387 Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870

Change-Id: I1aa441d41d9256e843dee7745e865df8b0ccee53
2021-03-16 06:53:52 +00:00
Maciej Żenczykowski
b0c92ad6c8 Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165

Change-Id: I2dcb5a315a3abc81a88c2625f28392fd6933af20
2021-03-16 06:47:53 +00:00
Lorenzo Colitti
706d7ffb3e Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699

Change-Id: I2f7f6a5dcbc363bca3d113c0b2cb8e87aae450f2
2021-03-16 06:47:42 +00:00
Chalard Jean
bc786632cf Merge "[NS01.cn] Adjust calls for NetworkScore" 2021-03-16 06:36:07 +00:00
Maciej Żenczykowski
d3bb5a544c Merge "add test for TetheringUtils::setupNsSocket()" 2021-03-16 06:23:06 +00:00
Hungming Chen
23ee901e76 Do not start conntrack event monitor when running on R
Starting conntrack event monitor on R devices is unnecessary because
no code uses them.

Bug: 177884581
Test: atest TetheringCoverageTests
Change-Id: I036cb8e29b32a4e220da9a52849b978a6ab821e4
2021-03-16 14:18:32 +08:00
Lorenzo Colitti
d5edbb9eb4 Merge "Add a test for TetheringUtils.setupNaSocket." 2021-03-16 06:17:37 +00:00
Maciej Żenczykowski
e7c57368f8 add test for TetheringUtils::setupNsSocket()
Bug: 154669942
Test: test-only change
Change-Id: I33fe5a92667a0a6ee38bbcfdee40405cd37cc30f
2021-03-15 21:10:21 -07:00
Lorenzo Colitti
82d4b9956d Add a test for TetheringUtils.setupNaSocket.
Because most of the tethering tests are unprivileged, we cannot
test this code on real sockets. So use an AF_UNIX socketpair.

Bug: 154669942
Bug: 182785371
Test: test-only change
Change-Id: I843fddb3aaeab33628438f3bcd6a4166062de962
2021-03-15 21:01:42 -07:00
Remi NGUYEN VAN
16763614c0 Merge changes from topic "conn_resources_cp" am: 016e0b9261
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019

Change-Id: I2e4fa4c5f04463163a058806633571862d4eefd5
2021-03-16 03:11:28 +00:00
Remi NGUYEN VAN
fb1f5458d0 Add ServiceConnectivityResources to tethering am: 60f4c2f425
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872

Change-Id: Ieed8fd3fe6cca6857c8c398f73143df41ac2d743
2021-03-16 03:11:26 +00:00
Remi NGUYEN VAN
016e0b9261 Merge changes from topic "conn_resources_cp"
* changes:
  Add ServiceConnectivityResources to in-process APEX
  Add ServiceConnectivityResources to tethering
2021-03-16 02:29:31 +00:00
Lorenzo Colitti
464a83c23f Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ede15f58bc875b49f410366cabe96a02cd89b65
2021-03-15 13:50:37 +00:00
Lorenzo Colitti
9bcb23851b Merge "Do not open BPF maps when running on R." am: d12f867cb0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ca4cb0fe13ee3b9c76577a5f21760f6f6cfcf36
2021-03-15 13:50:25 +00:00
Lorenzo Colitti
79cd256ec2 Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica55e1ae0cbda05a456add36e8fbcd6c866e63cb
2021-03-15 13:48:39 +00:00
Lorenzo Colitti
e8e91c1726 Merge "Add test for RouterAdvertisementDaemon." 2021-03-15 13:21:03 +00:00
Lorenzo Colitti
d12f867cb0 Merge "Do not open BPF maps when running on R." 2021-03-15 13:13:15 +00:00
Lorenzo Colitti
25e4e50f25 Merge "Fix NullPointerException when running testRequestBackgroundNetwork" 2021-03-15 13:09:14 +00:00
lucaslin
bfaefe42d1 Fix NullPointerException when running testRequestBackgroundNetwork
aosp/1622675 made handler to be nonnull but
testRequestBackgroundNetwork still pass null as handler when
calling requestBackgroundNetwork, so there is a NullPointerException
when running testRequestBackgroundNetwork.

Bug: 175662146
Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork
Change-Id: I871992549dfc8cc356221164f1dd49c64f0dae67
2021-03-15 18:49:10 +08:00
Lorenzo Colitti
3c228f4923 Do not open BPF maps when running on R.
Opening the maps on R devices is unnecessary (because no code
uses them) and unsafe (because the maps might actually be in a
different format than expected by the module).

Always return null when opening the maps, so the code will safely
fall back to using netd for anything.

This only affects dump(). The production code never opens the
maps except via the shim, and only the S shim opens the maps.
Also check isAtLeastS in dumpCounters, because it opens the map
directly.

Bug: 177884581
Test: builds, boots, "dumpsys tethering" shows expected output
Change-Id: I5884490a5cc40fc529a12100ae5baaeae6a18f30
2021-03-15 10:44:53 +00:00
Chalard Jean
1fc092ac59 [NS01.cn] Adjust calls for NetworkScore
Test: NetworkAgentTest
Change-Id: I67b7adb867ec0fdb4ef17f00edd518836b69c8f3
2021-03-15 09:50:03 +00:00
markchien
2af32e475f Add test for RouterAdvertisementDaemon.
bug: 154669942
Test: atest TetheringPrivilegedTests
Change-Id: I2bbea720c486d6bb47a8d86375847894e2b2f390
2021-03-15 08:20:57 +00:00
Remi NGUYEN VAN
a564d023d0 Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0796324e5b1f5f38890b655f988c91a496612e1
2021-03-15 02:05:41 +00:00
Chiachang Wang
c1f14634a4 Replace the usage of UidRange
The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.

The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
2021-03-15 10:04:08 +08:00
Remi NGUYEN VAN
e2c74e90a9 Merge "Update sources of Tethering module since it is renamed" 2021-03-15 01:32:47 +00:00
Remi NGUYEN VAN
2fb22c2a2b Add ServiceConnectivityResources to in-process APEX
The APK was added to the standard APEX, but is missing in the
in-process APEX.

Bug: 182557971
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
Merged-In: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d

Change-Id: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d
Test: m
2021-03-14 12:33:30 +09:00
Lorenzo Colitti
939d48f96c Merge "Add a test for upstream selection." am: f427d49541
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I891027b54d90fb01784158ec690f3880c5125f42
2021-03-12 14:38:02 +00:00
Lorenzo Colitti
f427d49541 Merge "Add a test for upstream selection." 2021-03-12 14:07:01 +00:00
Lorenzo Colitti
473399ceab Add a test for upstream selection.
Currently, upstream selection is split between the Tethering and
UpstreamNetworkMonitor classes. The UpstreamNetworkMonitor bits
are unit tested, but there are no tests for the interaction of
the two. Add a simple test.

In order to do this, remove the code that controls the
UpstreamNetworkMonitor spy from prepareUsbTethering. This is so
that the new test can call prepareUsbTethering but still rely on
the behaviour of the actual UpstreamNetworkMonitor.

Bug: 173068192
Test: atest TetheringTests
Change-Id: If2ef9af82bc0cbff9172e575ad3d7686e5b492da
2021-03-12 17:59:02 +09:00
Remi NGUYEN VAN
60f4c2f425 Add ServiceConnectivityResources to tethering
The resource package is used by service-connectivity to load its own
resources.

Bug: 182125649
Test: atest FrameworksNetTests

Merged-In: I3c7fc6285f10318ecef05a64e1179054bb831d99
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a

Change-Id: I3c7fc6285f10318ecef05a64e1179054bb831d99
2021-03-12 17:50:41 +09:00
Maciej Żenczykowski
5254c0c243 Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I846f007b1da04929826d4c687b93d7c3a6f56185
2021-03-12 01:01:39 +00:00
Hungming Chen
129077bd58 [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54098527fb72260c01c78d0b49282da4257f4a24
2021-03-12 01:01:36 +00:00
Maciej Żenczykowski
3357388742 Merge changes from topic "attach_bpfprog_in_mainline"
* changes:
  [NFCT.TETHER.15] Attach BPF program in the mainline module
  [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor
2021-03-12 00:21:01 +00:00
Remi NGUYEN VAN
0594e93b46 Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7778338f37a592a37d215af63d9cf6578c5407b8
2021-03-12 00:10:08 +00:00
Remi NGUYEN VAN
ce2ab07074 Merge "Rename StringNetworkSpecifier to Ethernet" 2021-03-11 23:51:49 +00:00