Merge "Load tcutils in ConnectivityService" am: fff2733066
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955584
Change-Id: I3624bbdd5e4da3420b1c74d1db9ca8cec09162a6
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-01-27 10:49:38 +00:00
8e8bc3e5ee
Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303
Change-Id: Iedd5e3d591d454c2ff7b8e697f488124e00a74c1
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-27 10:49:04 +00:00
852cc7891e
Expose local route exclusion API in NetworkAgentConfig am: e84d7d90d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962621
Change-Id: Iaac7a8112c7599064c09a79a6046ecb9b840a0a0
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-27 10:48:36 +00:00
3725a00155
Merge "Load tcutils in ConnectivityService"
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-01-27 10:31:02 +00:00
fff2733066
Merge "Test UidCounterSetMap in NetworkStatsServiceTest"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-27 10:02:35 +00:00
dd26c5709e
Expose local route exclusion API in NetworkAgentConfig
...
Bug: 184750836
Test: make update-api
Test: atest FrameworksNetTests
Change-Id: I70470ab3a945570a23607e39d18f9825d9e1d7aa
CTS-Coverage-Bug: 184750836
Chiachang Wang
commited 2022-01-27 09:53:33 +00:00
e84d7d90d3
Test UidCounterSetMap in NetworkStatsServiceTest
...
Test: atest FrameworksNetTests
Change-Id: I1ae720fcc3192712b3dcbe69619f97f7df1a1f5e
markchien
commited 2022-01-27 17:28:19 +08:00
8f3917501b
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907
Change-Id: I6c3b880f83f1af42ca65ee6b0171c2d223fedfb2
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-27 09:23:50 +00:00
9d39295472
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-27 09:20:10 +00:00
bfdd0f3c3c
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305
Change-Id: Id6bfe506a96e2abeae8a3f6dd1c61f4b4873e397
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-27 08:40:35 +00:00
7cac3f3286
Merge "Change NETWORK_TYPE_5G_NSA reference package"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-01-27 08:36:23 +00:00
85a2ef3dd5
Load tcutils in ConnectivityService
...
Bug: 157552970
Test: TreeHugger
Change-Id: Ic2204260e822b082f58e5f01e5da8dad879ab22f
Patrick Rohr
commited 2022-01-27 09:07:36 +01:00
e258c5913d
Merge "Use the network stack shims in services connectivity" am: 6c24db946d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961300
Change-Id: Ie1afdd8c586a1060db72447db7de8b264d73a621
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-01-27 07:54:53 +00:00
46ff4399f6
Merge "Use the network stack shims in services connectivity"
Jean Chalard
authored and
Gerrit Code Review
commited 2022-01-27 07:36:53 +00:00
6c24db946d
Merge "Add getEnterpriseId api to network request" am: 71c9ca453d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960884
Change-Id: I1362e038ed047ea570a725a9816a90634f40c35b
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-27 05:59:06 +00:00
fc539a07ca
Merge "Adding bt dependency" am: d97f3a1901
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960370
Change-Id: I74cd8ce8506d9fff75fa4b46ef191a4046d1a068
Rahul Sabnis
authored and
Automerger Merge Worker
commited 2022-01-27 05:58:34 +00:00
e4383b7095
Merge "Add getEnterpriseId api to network request"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-01-27 05:52:54 +00:00
71c9ca453d
Merge "Adding bt dependency"
Rahul Sabnis
authored and
Gerrit Code Review
commited 2022-01-27 05:42:18 +00:00
d97f3a1901
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code." am: c7231f3e79
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403
Change-Id: If08bd9b6438b5e808f3628ae3dd4191ec361ff43
Wei Li
authored and
Automerger Merge Worker
commited 2022-01-27 00:37:41 +00:00
42872abcee
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code."
Wei Li
authored and
Gerrit Code Review
commited 2022-01-27 00:22:49 +00:00
c7231f3e79
Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code.
...
Property "exclude_kotlinc_generated_files" is recently added to exclude some kotlinc generated files that are not needed if kotlin reflection is not used. Currently it defaults to false since there are test failures(b/213966211) which is in FullScoreTest#testToString and FullScoreTest#testMinMaxPolicyConstants that uses kotlin reflection and fails if exclude_kotlinc_generated_files defaults to true. By setting explicitly exclude_kotlinc_generated_files to false on tests like FullScoreTest#testToString, we will be able to finally default this property to true so the kotlinc generated files can be removed for most modules that don't need them.
Bug: 204888276
Bug: 213966211
Test: atest
FrameworksNetTests: com.android.server.connectivity.FullScoreTest
Change-Id: I4ed2d27c27841cb7127f669c8db34c90b4a41b1f
Wei Li
commited 2022-01-26 18:25:23 +00:00
8a177f694a
Add getEnterpriseId api to network request
...
Bug: 194332512
CTS-Coverage-Bug: 216481336
Test: build
Change-Id: I1446f8eecf43f7c6d243dc82af08d04957dd60e3
Sooraj Sasindran
commited 2022-01-26 17:26:50 +00:00
7e9b25e7f9
[MS59.2] Add unit test for NetworkStatsDataMigrationUtils
...
Test: atest NetworkStatsDataMigrationUtilsTest
Bug: 204830222
Change-Id: Ia6e8aec9a828072a2a1e63bec600c2e20d3699b3
junyulai
authored and
Junyu Lai
commited 2022-01-26 16:53:06 +00:00
a1bb3a36cd
Change NETWORK_TYPE_5G_NSA reference package
...
NETWORK_TYPE_5G_NSA is moved to NetworkStatsManager
Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I9226119ee4f67688a1b4ffdab7e5a86ec0b8e974
Aaron Huang
commited 2022-01-26 23:41:17 +08:00
b4ce0fa9b1
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299
Change-Id: I52678ffbc74b10e5d74c8cce5886543df9a1ad57
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-01-26 15:04:48 +00:00
c08c9c8d96
Merge changes Ie826477d,I5125a3ac
...
* changes:
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging
[CLATJ#25] ClatCoordinator: stop clatd process gracefully
Nucca Chen
authored and
Gerrit Code Review
commited 2022-01-26 14:50:11 +00:00
f8ed984e9c
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging
...
Bug: 212345928
Test: build
Change-Id: Ie826477d27db26cc49d113ec8bfacaaa3006e26e
Hungming Chen
authored and
Nucca Chen
commited 2022-01-26 12:23:45 +00:00
6fb21144b8
[CLATJ#25] ClatCoordinator: stop clatd process gracefully
...
Send SIGTERM with timeout first, if fail, SIGKILL.
Bug: 212345928
Test: connect/disconnect to IPv6 only network and ping 8.8.8.8
repeat 3 times
Change-Id: I5125a3ac7e8ab6d4e8ae7fc7134b8ac8e42ce5dd
Hungming Chen
authored and
Nucca Chen
commited 2022-01-26 12:23:22 +00:00
1ff914a543
Use the network stack shims in services connectivity
...
Test: m
Change-Id: I8ac4f291cd78720fd3b0d433872881aa98f10d73
Chalard Jean
authored and
Sooraj Sasindran
commited 2022-01-26 03:12:21 -08:00
96400daaa9
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks am: 30f06afda3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958895
Change-Id: Ie744e15f46fe4cab6bcd03fb3aaf27bffd1bae30
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-26 10:47:26 +00:00
0572b950b9
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks
...
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: I00abc97a98dfdf17d5f0c2e6b45d28be9899c5c3
Junyu Lai
commited 2022-01-26 07:53:57 +00:00
30f06afda3
Adding bt dependency
...
Bug: 206121418
Test: Compile
Merged-In: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2
Change-Id: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2
Roopa Sattiraju
authored and
Rahul Sabnis
commited 2022-01-25 20:27:30 -08:00
27acf0b677
Merge "Send exclude local routes value to netd for VPN network" am: 317be96553
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948168
Change-Id: Icb5b54a205fe07b704238d2f65f78a24f4e1e36d
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-26 02:22:45 +00:00
35a7b80089
Merge "Send exclude local routes value to netd for VPN network"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-01-26 02:09:35 +00:00
317be96553
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178
Change-Id: Id9a0d9fe4279aa8cd9ceafe475be31db5925f495
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:41:03 +00:00
74fe555a17
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
...
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
...
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
...
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
...
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
...
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
Patrick Rohr
authored and
Automerger Merge Worker
commited 
Mark Chien
authored and
Chiachang Wang
authored and
Gerrit Code Review
commited 
Junyu Lai
authored and
Aaron Huang
authored and
Jean Chalard
authored and
Sooraj Sasindran
authored and
Rahul Sabnis
authored and
Wei Li
authored and
Nucca Chen
authored and
Roopa Sattiraju
authored and
Maciej Żenczykowski
authored and
Ken Chen
authored and