Commit Graph

9941 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
86301b1ae1 Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98afe8d83f2a111b0a0bc3bc1081fb35ea31a328
2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
68b759c2c1 Merge "Add dependency on system API in connectivity" am: bc1bdf4a85
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1db46318bbccfc496f5fcc9481e177d66e9b46a
2021-03-01 02:10:04 +00:00
Lorenzo Colitti
c715bf96b9 Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I524c692df857f07d17d038271597137fcb38d705
2021-03-01 02:04:29 +00:00
Remi NGUYEN VAN
bc1bdf4a85 Merge "Add dependency on system API in connectivity" 2021-03-01 01:07:19 +00:00
Lorenzo Colitti
894c6ff74a Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b6636bd7b8a6419341bcf1e0c65a62dea27e0b0
2021-03-01 00:46:54 +00:00
Lorenzo Colitti
589d0ad195 Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.

Bug: 167645754
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
2021-03-01 00:16:36 +09:00
Remi NGUYEN VAN
74b274424a Add dependency on system API in connectivity
The system API are moved to the connectivity module: add dependency on
the stubs from framework-tethering.

This only allows tethering to depend on system API defined by the
connectivity classes, not on any private code, even if they are
eventually bundled in the same APEX.

Bug: 171540887
Test: m

Merged-In: Iebfb3e01c5d2480e84edcfc76cf489520bd60237
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
(clean cherry-pick from internal branch)

Change-Id: Iebfb3e01c5d2480e84edcfc76cf489520bd60237
2021-02-26 19:36:06 +09:00
Junyu Lai
239c23c9dc Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I856c51aa30da6d9e5097aee2a65fb99f8c6fb8aa
2021-02-26 10:07:11 +00:00
Remi NGUYEN VAN
af4b10e326 Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib53feb1dce0a6f2c84d493fc5cbfa248320ecea1
2021-02-26 10:02:30 +00:00
Junyu Lai
3ec8882370 Merge "Fix CTS test failed on R device" am: 75d28bee27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76b422a0f86a5ca63021d1cb88db37089a310280
2021-02-26 09:31:05 +00:00
Remi NGUYEN VAN
a474b9edfa Merge "Add flag to force choosing upstreams automatically" am: e43c960d50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6b4415a3a3f507101d63b53296925b3572ebf1e
2021-02-26 09:30:57 +00:00
Treehugger Robot
c6551d73b7 Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I325505e6f5431134e6b5dc336a5e120479157d29
2021-02-26 09:15:06 +00:00
Treehugger Robot
ff55bbf0f4 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie672e82b07825833a1417f0ca67dd0e8e413eabf
2021-02-26 09:14:53 +00:00
Junyu Lai
75d28bee27 Merge "Fix CTS test failed on R device" 2021-02-26 07:17:47 +00:00
Remi NGUYEN VAN
e43c960d50 Merge "Add flag to force choosing upstreams automatically" 2021-02-26 06:42:00 +00:00
Treehugger Robot
f1a420808c Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3542628882fdaa25ed0a5b2c073f596ea198b
2021-02-26 06:05:10 +00:00
Treehugger Robot
9ea87036a8 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d58bccf80be1fa6346922abd769c1b96e4274be
2021-02-26 06:04:04 +00:00
Treehugger Robot
fcd5ec1971 Merge "ebpf offload: bump size of ipv4 tethering maps" 2021-02-26 05:43:07 +00:00
Treehugger Robot
4945772ba7 Merge "ebpf offload: mark as critical for tethering not netd" 2021-02-26 05:39:07 +00:00
Maciej Żenczykowski
8549af9f17 ebpf offload: bump size of ipv4 tethering maps
For ipv6 we need 1 entry per client, so 64 seems like plenty,
while for ipv4 we need 1 entry per flow, so even 1024 seems
like it might not be enough, but it's much better than 64.

Nucca says:
  # cat proc/sys/net/netfilter/nf_conntrack_buckets
  65536
  # cat proc/sys/net/netfilter/nf_conntrack_max
  262144

  per https://www.kernel.org/doc/Documentation/networking/nf_conntrack-sysctl.txt
  the default “nf_conntrack_max” is “nf_conntrack_buckets * 4”.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib7d1d8c19bc688c442d842cf5c9f45cdf1241754
2021-02-25 19:11:39 -08:00
Maciej Żenczykowski
607d6dda0d ebpf offload: mark as critical for tethering not netd
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5bccfcbababb09a412ac1093513ad93c254b349b
2021-02-25 19:10:01 -08:00
Junyu Lai
5e92915fa0 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie52bba30ff711c91ef36cb2add9167fbfc80e005
2021-02-25 12:48:07 +00:00
Junyu Lai
b209d3a2a7 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfe60822e28968c52514497e43537cb6e9c0fae3
2021-02-25 11:03:33 +00:00
Junyu Lai
3f134a3805 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" 2021-02-25 10:16:03 +00:00
Chalard Jean
a1596090db Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5156e2a908c969c80eb09123fe88bef0ecc4285
2021-02-25 09:36:31 +00:00
Chalard Jean
d3e8ae1f88 Merge "Release test network in a test" am: 26c11595bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae36d7f39bd1ff5287311df965829f6dee3de0d4
2021-02-25 08:46:15 +00:00
Chalard Jean
26c11595bc Merge "Release test network in a test" 2021-02-25 08:06:15 +00:00
Daulet Zhanguzin
f82155f4b9 Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dba95a6c7cdf6ea57b21136b40e8debcf9490db
2021-02-25 08:01:32 +00:00
Daulet Zhanguzin
c4f27ccd99 Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46509df9b0f5c69d698f14c5a253b75fd4f71729
2021-02-25 07:24:03 +00:00
junyulai
d69d7c815c Fix CTS test failed on R device
The test failed since the API is not available on R device.
Add conditions to ignore it.

Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideVpnTests
      on R device
Bug: None
Change-Id: I05a1f63adec72e89382cb095db714bccbdff0058
2021-02-25 08:39:28 +08:00
Chalard Jean
8a8bf7434c Release test network in a test
This causes failures in subsequent tests that expect
only one test network to be up.

Bug: 181033598
Test: this
Change-Id: I74444f4aff7750a5bbd2564e5e22714d73c72d8b
2021-02-24 23:07:13 +09:00
Daulet Zhanguzin
bb540131b7 Use unbundled version of BouncyCastle in Ike cts tests
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-24 13:09:36 +00:00
Lorenzo Colitti
ad38d27ebb Add a BpfMap#clear method. am: ffb0ccd04b am: 10be22076e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e4d5e6005cdd006ddd814692714fb80a6c46936
2021-02-24 12:30:56 +00:00
Lorenzo Colitti
10be22076e Add a BpfMap#clear method. am: ffb0ccd04b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idebe06d79cb8f6e91634057c59bb0cc022ba1ee0
2021-02-24 11:40:11 +00:00
Lorenzo Colitti
f6603588ab Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfdd67fa1502614e57d7a2b3ea6fdae788024b4c
2021-02-24 07:00:05 +00:00
Lorenzo Colitti
4d09a87075 Move definitions used by tethering bpf code into the module. am: 56be03eb28 am: 69b0769eb0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I842250d341916f7d5a1f48ba8ec09c4235d20d51
2021-02-24 06:59:26 +00:00
Lorenzo Colitti
ffb0ccd04b Add a BpfMap#clear method.
A caller can mostly already do this via forEach(), but having a
specific method is faster (since the code does not need to read
the value) and easier to use.

The semantics of this method (e.g., ignore ENOENT while deleting
a key, but throw on any other error) match those of the native
BpfMap::clear method.

Test: new unit tests
Change-Id: I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9
2021-02-24 06:09:46 +00:00
Lorenzo Colitti
6af777632d Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedfba98ac066241a5959fc45d28d0feb8db159ab
2021-02-24 05:52:14 +00:00
Lorenzo Colitti
69b0769eb0 Move definitions used by tethering bpf code into the module. am: 56be03eb28
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b84ca223c4a950a55cb63642a435e87e158949d
2021-02-24 05:51:57 +00:00
Lorenzo Colitti
2be434ab12 Make the CTS tests explicitly depend on modules-utils-build.
In AOSP master and downstream branches, this likely works via a
transitive dependency. In mainline-prod, this doesn't work. Add
the dependency explicitly, since it makes things build everywhere
and in general it's also good practice to "include what you use".

Bug: 167645754
Test: m CtsNetTestCasesLatestSdk in mainline-prod has fewer errors
Change-Id: Ie575372415a806deee9996aab7f920d2c15bff80
2021-02-24 05:43:36 +00:00
Lorenzo Colitti
56be03eb28 Move definitions used by tethering bpf code into the module.
Bug: 167645754
Test: m com.android.tethering
Change-Id: Ia4fb1201e5f4e0c35baba7865b26b4cec0945a64
2021-02-24 12:16:05 +09:00
Treehugger Robot
d517fa33a0 Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I652339d80d81e97399a35e5c2740d878a458a560
2021-02-22 12:49:20 +00:00
Treehugger Robot
1eed01b25c Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07 am: ac7587318f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8b0bf1eb1c93dd568d8a5bb9cf002c9b67b81bf
2021-02-22 12:48:39 +00:00
Treehugger Robot
0919cc06c5 Merge "Fix CTS test failed on R device" am: afa18f0256
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If786db7b5635bcd4bb41043169e1c187b13d0eee
2021-02-22 11:50:46 +00:00
Treehugger Robot
ac7587318f Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7260575a7b680dbe09599aba59ef597ed42d387b
2021-02-22 11:47:12 +00:00
Treehugger Robot
afa18f0256 Merge "Fix CTS test failed on R device" 2021-02-22 10:37:29 +00:00
Treehugger Robot
f754671f07 Merge "Add MUTABLE flag when creating PendingIntent" 2021-02-22 10:29:31 +00:00
Treehugger Robot
f59622b124 Merge "Fix flaky test by extending timeout" am: 2108eada65 am: e46d5eb40f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a738c6a7d74951e3c13dd3cf557b4de88f18f2
2021-02-22 10:23:43 +00:00
Treehugger Robot
e46d5eb40f Merge "Fix flaky test by extending timeout" am: 2108eada65
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad9a392266b878e97244181f6398ca421160f311
2021-02-22 08:55:09 +00:00
Treehugger Robot
2108eada65 Merge "Fix flaky test by extending timeout" 2021-02-22 07:58:10 +00:00