Merge changes from topic "preparation_fork_clatd_from_system_server"
...
* changes:
[CLATJ#24] ClatCoordinatorTest: add basic unit tests
[CLATJ#23] Close the file descriptor manually
[CLATJ#22] ClatCoordinator: stop clatd
[CLATJ#21] ClatCoordinator: start clatd
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-26 00:26:48 +00:00
43f9729e90
Merge "Correct typos in libnetworkstats" am: 1b5f93df43 am: 8cb78a196f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957868
Change-Id: I8869aa7008d399a0cbbc0e5ad659c245257b5fa2
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:22:58 +00:00
35a32f7549
Merge changes from topic "libnetworkstats" am: e1f8ad4d59 am: f1d14732f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140
Change-Id: I706e7befef3943936a33c06637194d7dc27a3037
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:22:21 +00:00
9eaab00310
Copy libnetdbpf from system/net to tethering module am: f2bb7b1ae8 am: 6eabb57bc9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958139
Change-Id: I40b7c895b1acd9481184605bdaf0c707ded22f0b
Ken Chen
authored and
Automerger Merge Worker
commited 2022-01-26 00:22:20 +00:00
80f24bfa4e
Merge "Correct typos in libnetworkstats" am: 1b5f93df43
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957868
Change-Id: Ife12509c7859840df388d5492f66a9c884801e4d
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:05:35 +00:00
8cb78a196f
Merge changes from topic "libnetworkstats" am: e1f8ad4d59
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140
Change-Id: Ieaa47c2db815177eca095fcd424ece3926ddf460
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:05:13 +00:00
f1d14732f9
Copy libnetdbpf from system/net to tethering module am: f2bb7b1ae8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958139
Change-Id: Ie39ce8300f72f5801ba4db83c6e09f4a5c3209f9
Ken Chen
authored and
Automerger Merge Worker
commited 2022-01-26 00:05:12 +00:00
6eabb57bc9
Merge "Correct typos in libnetworkstats"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-25 23:52:32 +00:00
1b5f93df43
Merge changes from topic "libnetworkstats"
...
* changes:
Rename libnetdbpf to libnetworkstats
Copy libnetdbpf from system/net to tethering module
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-25 23:52:06 +00:00
e1f8ad4d59
Merge "Add low latency and high bandwidth network capabilities" am: d8645e27c7 am: ab8edbc5aa am: 66d3558ecd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952516
Change-Id: I421e40caefd4266cbbb2c3dbc9b8eadef1bf9f35
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-25 21:56:00 +00:00
9b7ed8b017
Merge "Add low latency and high bandwidth network capabilities" am: d8645e27c7 am: ab8edbc5aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952516
Change-Id: Ifde1d7f60fa8842278ab8b128c9028899bb87251
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-25 21:36:51 +00:00
66d3558ecd
Merge "Add low latency and high bandwidth network capabilities" am: d8645e27c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952516
Change-Id: I00fba6791a99ae4ad6082822b2c767e79a59828a
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-25 21:19:12 +00:00
ab8edbc5aa
Merge "Add low latency and high bandwidth network capabilities"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-01-25 21:06:16 +00:00
d8645e27c7
Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined" am: e0904b5a12 am: ed96e31624 am: be9f984fb6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957213
Change-Id: Ic320346b8713f6b0a90f5ef84864481c1580606a
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-25 20:21:59 +00:00
80d88c371e
Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined" am: e0904b5a12 am: ed96e31624
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957213
Change-Id: Id67ccd5137a18f73d7d7e941270d7aded1e658c5
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-25 19:51:50 +00:00
be9f984fb6
Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined" am: e0904b5a12
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957213
Change-Id: Ied24d14d87c99e12071212e4bfece0e404fd2973
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-25 19:33:34 +00:00
ed96e31624
Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-25 19:07:13 +00:00
e0904b5a12
adjust BpfCompatTest now that clatd & netd bpf program have been mainlined
...
The purpose of this test is to verify that the bpfloader related
stuff in the platform is compatible with mainline module bpf .o's.
To be more precise: the test is trying to check that platform/OEM
BPF programs (and, by implication, the platform/OEM bpfloader) have
a struct layout that is known, and thus that BPF programs shipped
in mainline modules will be compatible (with the OEM bpfloader).
(ie. basically this is trying to make sure that the vendor/oem
haven't made incompatible changes to the bpfloader parsed structs,
these can only be extended safely in aosp master)
Since clatd/netd.o have been moved to mainline they are no longer
a useful representation of the state of the platform side of things.
(we'd simply be testing that mainline is compatible with mainline,
which of course it is...)
As such we pick two other bpf .o files that are still shipped
as part of the platform.
Verified on cuttlefish via 'atest CtsNativeNetTestCases':
x86 CtsNativeNetTestCases
-------------------------
CtsNativeNetTestCases (2 Test(s))
[1/2] BpfTest#bpfStructSizeTestPreT: IGNORED (0ms)
[2/2] BpfTest#bpfStructSizeTest: PASSED (0ms)
Summary (Test executed with 1 device(s).)
-------
x86 CtsNativeNetTestCases: Passed: 1, Failed: 0, Ignored: 1, Assumption Failed: 0,
All tests passed!
Note: it's not clear to me if this code can even ever be run on pre-T devices...
but I guess it shouldn't hurt.
Bug: 215718693
Test: atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1b2d76e5ef95d8e4b94068f5525263653879d1f4
Maciej Żenczykowski
commited 2022-01-25 19:06:51 +00:00
45f940a9ee
Add low latency and high bandwidth network capabilities
...
Bug: 194332512
Test: build
Change-Id: I415ca1ba90ea54c4106f806fe855bcb84d3e38ba
Sooraj Sasindran
commited 2022-01-25 09:35:30 -08:00
f8eb713874
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02 am: 4ebfa5be46 am: 31d73d262c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862
Change-Id: I7a9820aedc77f59c0c9c9d139c5c104c9b6aa0be
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 17:23:28 +00:00
e3b4b17eef
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02 am: 4ebfa5be46
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862
Change-Id: I3c9eaf13a174979037455270863384dd6ecc084e
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 17:13:09 +00:00
31d73d262c
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862
Change-Id: I841f09c6b97ab20c5b4a20dcb1fe015a0dc79415
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 16:49:54 +00:00
4ebfa5be46
Merge "[DU09-1]Adding the NetworkStatsCollection Builder"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-25 16:44:16 +00:00
41483efa02
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4 am: 28ddad840d am: 27b14257ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899
Change-Id: Ic80aaf0de0ea978b45d919963cc36816f1d0d0c1
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 14:26:41 +00:00
ac047e72e1
Merge "Add a simple test for ConnectivityService#dump." am: 4e9ab4dde0 am: b504fb0b35 am: 5192a78227
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940840
Change-Id: I9a99634128d4bad7a14b7ebd24265468d5177b1c
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-01-25 14:26:19 +00:00
c731e400b0
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4 am: 28ddad840d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899
Change-Id: I580341450056d53867e7584a3dceb0b70c8e3cb6
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 14:10:09 +00:00
27b14257ec
Merge "Add a simple test for ConnectivityService#dump." am: 4e9ab4dde0 am: b504fb0b35
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940840
Change-Id: I9977a0109920693cf721d7f4e231fff05fbe5d74
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-01-25 14:09:49 +00:00
5192a78227
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899
Change-Id: I5e18e248727d3aa2da11a7aee39b9584cb24326d
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 13:52:07 +00:00
28ddad840d
Merge "Add a simple test for ConnectivityService#dump." am: 4e9ab4dde0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940840
Change-Id: I530c558b7b7e3988cd0e26f11a2c5e6fa5bf2f12
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-01-25 13:51:33 +00:00
b504fb0b35
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-25 13:30:57 +00:00
bc8328bda4
Merge "Add a simple test for ConnectivityService#dump."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-01-25 13:30:17 +00:00
4e9ab4dde0
[CLATJ#24] ClatCoordinatorTest: add basic unit tests
...
Introduce ClatCoordinatorTest for unit tests of class ClatCoordinator.
Add the tests:
- testStartStopClatd
- testGetFwmark
- testAdjustMtu
Bug: 212345928
Test: atest FrameworksNetTests
Change-Id: I6908eac05b14077b450d51e1432d340c8a247eb1
Hungming Chen
commited 2022-01-25 20:32:25 +08:00
358d582730
[CLATJ#23] Close the file descriptor manually
...
ParcelFileDescriptor rely on garbage collection to close handler.
When there is any error during starting clat or quick on/off
IPv6 only network, the file descriptor may not be able to be closed
before next clatStart is called. This may be problematic. For
example, the same v4- tun interface has not closed yet and clatStart
has been called again.
Test: connect/disconnect to IPv6 only network and ping 8.8.8.8
repeat 10 times
Change-Id: I8e1c66206dc221827a039213ecc86d5cbd777dff
Hungming Chen
commited 2022-01-25 20:32:11 +08:00
d7b63f8f93
[DU09-1]Adding the NetworkStatsCollection Builder
...
The purpose is provide NetworkStatsCollection.Builder as
public API for adding the stats {@link NetworkStatsHistory}
Bug: 215862801
Test: atest NetworkStatsCollectionTest
Change-Id: Id83c6fa67880ba361b8e0e15c4d86b90e44ac879
Frank
commited 2022-01-25 19:43:23 +08:00
c8856596c5
[CLATJ#22] ClatCoordinator: stop clatd
...
provide clatd stop function which stops clatd by pid.
Bug: 212345928
Test: flash and boot
Run "atest ClatCoordinatorTest" in a follow commit.
Change-Id: Icd9c4f9038bf75113fbc5608f213145e58a061d9
Hungming Chen
commited 2022-01-25 18:44:09 +08:00
9d11ddfd5c
[CLATJ#21] ClatCoordinator: start clatd
...
launch clatd with the given cli arguments.
Bug: 212345928
Test: flash and boot
- run "atest ClatCoordinatorTest" in a follow commit.
- manual test
1. Connect to ipv6-only wifi.
2. Try IPv4 traffic.
$ ping 8.8.8.8
Change-Id: Ie57a7c7a9d3d77396e91fa9f94c02f1ad05487c1
Hungming Chen
commited 2022-01-25 18:43:59 +08:00
9625caa8e5
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263 am: d743f4bfc8 am: 6754e1eafe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951100
Change-Id: I6c2214269e94e05946c3e33a3213a690d25ff95b
Paul Hu
authored and
Automerger Merge Worker
commited 2022-01-25 04:55:28 +00:00
485b340288
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263 am: d743f4bfc8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951100
Change-Id: Ie1cef27e3c3705637e00984ee92465c80cb58b2f
Paul Hu
authored and
Automerger Merge Worker
commited 2022-01-25 04:45:25 +00:00
6754e1eafe
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951100
Change-Id: I1489bfb94ec38a99426e68351d8af04bbfc2e930
Paul Hu
authored and
Automerger Merge Worker
commited 2022-01-25 04:30:45 +00:00
d743f4bfc8
Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22 am: 9eacb4584a am: c7a9d7115b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805
Change-Id: I278136f478fe975d8aa1941e19e837d9932f7b5a
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 04:24:05 +00:00
5ee2e66bdb
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 am: 7962445ee4 am: 3dcb0bdb5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804
Change-Id: I7d8ef9128dee274a0c6b66f4632c0034ff8075da
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 04:23:27 +00:00
9703676663
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar"
Paul Hu
authored and
Gerrit Code Review
commited 2022-01-25 04:15:41 +00:00
eead25d263
Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22 am: 9eacb4584a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805
Change-Id: I157639c1504c44ce2070b7d4a1ce2086742e3039
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 04:06:41 +00:00
c7a9d7115b
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 am: 7962445ee4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804
Change-Id: Iaa8e716574f77da61e2d0f9fa7cb42fcbb5fbf07
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 04:06:14 +00:00
3dcb0bdb5a
Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805
Change-Id: I98a0a978682346855625b5d9673a47c9ae0fd22a
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 03:49:20 +00:00
9eacb4584a
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804
Change-Id: Ife48b26f966b78d9a9016332bb968c3c863b8425
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 03:48:16 +00:00
7962445ee4
Merge "Replace some netd calls in NetworkManagementService"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-25 03:34:54 +00:00
7586d33f22
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-25 03:34:14 +00:00
f3cf7c00a6
Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda am: fec250f525 am: 5367f0aa57
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145
Change-Id: If09620589c4f04b643ccdcd3d70922a347ab6d0c
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 02:07:44 +00:00
87080981c0
Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda am: fec250f525
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145
Change-Id: Ibcc2a34126f201751c3c5e1485708e02eaa37822
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 01:52:23 +00:00
5367f0aa57