Treehugger Robot
5298ddbb00
Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0 am: 3a6c47e8ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393
Change-Id: Ia49eb7404bc856acac6f62fd3e480efd1674e66c
2021-06-15 07:34:49 +00:00
Treehugger Robot
3a6c47e8ca
Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393
Change-Id: I48e40cda3974f9923ab9045d899033293e52d42c
2021-06-15 07:17:17 +00:00
Treehugger Robot
eb7d65af96
Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3 am: 703321fc81
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826
Change-Id: Iff7fec80b664de6c225a283f359389a9ddb50533
2021-06-15 07:08:55 +00:00
Treehugger Robot
a79b785ff0
Merge "Dump underlying BPF traffic stats as well as higher-level stats."
2021-06-15 07:05:05 +00:00
Treehugger Robot
703321fc81
Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826
Change-Id: I7468430e5e00282e63860bf6edcfcc5730bebed4
2021-06-15 06:58:54 +00:00
Treehugger Robot
1dba7454b3
Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId"
2021-06-15 06:46:49 +00:00
Lorenzo Colitti
19fb7cbecf
Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c am: 2ddc21f483
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694
Change-Id: I6246f3890bbf27d0d485ee3d3701dca7c23a3796
2021-06-15 05:43:46 +00:00
Lorenzo Colitti
6c7f137f2f
Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e am: 3231562efc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693
Change-Id: I2574e155f16c82fdc4647f23d2f77c0755062a52
2021-06-15 05:43:42 +00:00
Lorenzo Colitti
2ddc21f483
Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694
Change-Id: Ibcb5a3ace65e96497bc969f85c0febff32d80fec
2021-06-15 05:31:37 +00:00
Lorenzo Colitti
3231562efc
Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693
Change-Id: Ieced25169b51cf1db1f97447d5f754dd7443d524
2021-06-15 05:31:25 +00:00
Lorenzo Colitti
69c14d531c
Merge "Verify kernel implementation of ChaCha20Poly1305"
2021-06-15 05:18:24 +00:00
Lorenzo Colitti
ec5d07c59e
Merge "Support algorithm configurability in PacketUtils EspHeader"
2021-06-15 05:17:51 +00:00
Luke Huang
a040a3d568
[automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours
...
am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 18d636a05e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260
Change-Id: I32b0cdfdf3dcad796a0ccf4c4e237e326e878c94
2021-06-15 04:59:23 +00:00
Luke Huang
fcc69726ed
Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev
2021-06-15 04:52:43 +00:00
Cody Kesting
2052e3076d
[automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b -s ours
...
am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 dd346918b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444
Change-Id: Ic2d50ae70b9a14685a2de5a895111993423226ac
2021-06-15 04:49:09 +00:00
Treehugger Robot
5105c15011
[automerger skipped] Fully setup test TUN iface on create. am: 5cbd7b38ca -s ours
...
am skip reason: Merged-In I4c1262e566517bbb03dd610f595e4d18bc4e7735 with SHA-1 7a5fbc2b6e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443
Change-Id: If709059e6e0732b0701066af67c10133e807e937
2021-06-15 04:49:06 +00:00
Les Lee
a0592d3e06
Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId
...
Starting with API level 31, the subscriberId is applicable
for the wifi network. Considering applications may use
null or an empty string as subscriberId (for instance, cts),
frameworks create MATCH_WIFI_WILDCARD NetworkTemplate when querying
wifi network with null or an empty string which is the behavior before
API level 31.
Bug: 188915450
Test: atest -c NetworkStatsManagerTest
Change-Id: Id4ae06840e1749997e970b8f1ec391060967bd47
2021-06-15 12:04:23 +08:00
Lorenzo Colitti
704b8013f1
Dump underlying BPF traffic stats as well as higher-level stats.
...
This provides a better way to tell whether traffic is flowing.
Test: manual
Bug: 190783768
Change-Id: If557b0a18fc0aea1bf6a65d91547fc1930098ed0
2021-06-15 12:49:07 +09:00
Paul Hu
36df497e05
[automerger skipped] Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d am: 136bd35a67 -s ours
...
am skip reason: Merged-In I0ea71b348492aeb4784d487bed4cfd5d387426ba with SHA-1 c2198778ab is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718950
Change-Id: Id9376bb7d70324225771e19e48f4e0a30bb320ed
2021-06-15 03:05:04 +00:00
Paul Hu
136bd35a67
Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718950
Change-Id: I8167aaded9a7e2125cbe317401cc45365313b76d
2021-06-15 02:55:44 +00:00
Paul Hu
c323f6502d
Merge "Add DEFAULT_NETWORK_PRIORITY constants"
2021-06-15 02:42:03 +00:00
Paul Hu
364b86affe
[automerger skipped] Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0 am: c639d88a44 -s ours
...
am skip reason: Merged-In I63f65bffc1b8883ddfd774222e26e629d7ea1f94 with SHA-1 7ed70a944c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717436
Change-Id: Ib3deeef2f0aa478299ffa8b8fd9355c861946de9
2021-06-15 01:54:40 +00:00
Paul Hu
c639d88a44
Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717436
Change-Id: I0791a23eef801c24bf4605264a7478edd9167b88
2021-06-15 01:39:32 +00:00
Paul Hu
c6741064d0
Merge "Add more unit tests for mobile data preferred uids feature"
2021-06-15 01:28:19 +00:00
Yan Yan
8f12415e51
Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120 am: 83f08bd8ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692
Change-Id: I4b57cc2b0d1f3f6c6e01dc2eed9c63d42d253ad9
2021-06-15 01:06:38 +00:00
Yan Yan
83f08bd8ee
Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692
Change-Id: I051f69d58f9511fb6ad0574963b217324f54b155
2021-06-15 00:51:17 +00:00
Yan Yan
1e071f9120
Merge "Set up and tear down test network in TestNetworkRunnable"
2021-06-15 00:36:12 +00:00
Cody Kesting
f5a4fb124b
Keep subIds for Test NetworkCapabilities.
...
This CL updates NetworkCapabilities to retain configured subscription
IDs for Test NetworkCapabilities. Previously, they were cleared in
restrictCapabilitiesForTestNetwork().
Bug: 182291467
Bug: 189125789
Test: atest Ikev2VpnTest IpSecManagerTunnelTest
Test: atest CtsVcnTestCases
Change-Id: I0e1bc617910c9e8ac7b431572f276b1611acc1cb
Merged-In: I0e1bc617910c9e8ac7b431572f276b1611acc1cb
(cherry picked from commit a262a9d3d5 )
2021-06-14 20:51:28 +00:00
Treehugger Robot
5cbd7b38ca
Fully setup test TUN iface on create.
...
This CL updates TestNetworkService to fully setup test TUN
interfaces when created. Previously, the interface was only
created in netd when the Test Network was created.
Bug: 182291467
Bug: 189125789
Test: atest Ikev2VpnTest IpSecManagerTunnelTest
Change-Id: I4c1262e566517bbb03dd610f595e4d18bc4e7735
Merged-In: I4c1262e566517bbb03dd610f595e4d18bc4e7735
(cherry picked from commit 615237a818 )
2021-06-14 20:46:52 +00:00
Cody Kesting
e92ac168d0
Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad am: f92b7d2eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793
Change-Id: I1c561a9e9354379e4058854f8267f83f6a8980df
2021-06-14 19:46:57 +00:00
Treehugger Robot
5179e12560
Merge "Fully setup test TUN iface on create." am: 6c0525fbd5 am: 4b8900e520
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719792
Change-Id: I097e46c338c978f22f48e08fbcd584ef58b95ef8
2021-06-14 19:46:44 +00:00
Cody Kesting
f92b7d2eb8
Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793
Change-Id: Ifeaf14dc222b139838f15f6454cbc215869e3f20
2021-06-14 19:33:18 +00:00
Treehugger Robot
4b8900e520
Merge "Fully setup test TUN iface on create." am: 6c0525fbd5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719792
Change-Id: Id1f9993e2c945fdb7a150c701c43d095bcfed793
2021-06-14 19:33:08 +00:00
Cody Kesting
35839b48ad
Merge "Keep subIds for Test NetworkCapabilities."
2021-06-14 19:22:00 +00:00
Treehugger Robot
6c0525fbd5
Merge "Fully setup test TUN iface on create."
2021-06-14 19:14:02 +00:00
Sudheer Shanka
7b45312b50
Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71 am: 16063e8281
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977
Change-Id: I7a952ff80ce9f68c6a7a6a432799cc1b5b7d1b49
2021-06-14 19:13:27 +00:00
Sudheer Shanka
16063e8281
Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977
Change-Id: I9bc8d90381baf74cfe38bc0f30f61a284c86f339
2021-06-14 18:58:27 +00:00
Sudheer Shanka
7184887d71
Merge "Avoid waiting unnecessarily if there is no data to return."
2021-06-14 18:39:30 +00:00
paulhu
e99137226e
Add DEFAULT_NETWORK_PRIORITY constants
...
- Add default network priority to NetworkRequestInfo.
- The default network priority value is used when issue uid
ranges rules to netd. Netd will use the priority value and uid
ranges to generate corresponding ip rules specific to the given
network preference.
Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: I0ea71b348492aeb4784d487bed4cfd5d387426ba
Change-Id: I0ea71b348492aeb4784d487bed4cfd5d387426ba
2021-06-14 15:55:55 +00:00
paulhu
01f52e7cce
Add more unit tests for mobile data preferred uids feature
...
- Add more tests for mobile data preferred uids.
- Also address leftover comments on implementation commit.
Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: I63f65bffc1b8883ddfd774222e26e629d7ea1f94
Change-Id: I63f65bffc1b8883ddfd774222e26e629d7ea1f94
2021-06-14 15:53:05 +00:00
Paul Hu
ab4b8bc600
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886
Change-Id: Iabe8738dc2579bd89f6be377666c4e7a9178b1a6
2021-06-14 15:33:35 +00:00
Paul Hu
dcba997adf
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev
2021-06-14 15:17:23 +00:00
Paul Hu
31c7026ff9
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884
Change-Id: I5a97d3caea19c51597c63319bbb8a720c7f91977
2021-06-14 14:47:46 +00:00
Paul Hu
7d5fa3da7d
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev
2021-06-14 14:29:29 +00:00
Luke Huang
a46c4d2726
Modify NsdServiceTest to conform to its new mechanism
...
Adapt NsdServiceTest to its new mechanism for starting/stopping daemons.
Also, add a new test for the new self-cleanup mechanism.
Bug: 181810560
Test: atest NsdServiceTest
Original-Change: https://android-review.googlesource.com/1719018
Merged-In: I4c485a5d8fb4d6f52d82633a579bce4feb5c6375
Change-Id: I4c485a5d8fb4d6f52d82633a579bce4feb5c6375
2021-06-14 06:53:51 +00:00
Lorenzo Colitti
9088465b13
Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617
Change-Id: I1b99d78702c91ce3e4c69de95e09a0c1e7d7e4b5
2021-06-14 06:32:56 +00:00
Lorenzo Colitti
d9c5536026
Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617
Change-Id: Ibe5eac43f2c21c9ad5ea956a645d4ce59dcd7759
2021-06-14 06:19:02 +00:00
Lorenzo Colitti
473ddeaebb
Merge "Correctly get uids for per-app network preferences"
2021-06-14 06:07:56 +00:00
Lorenzo Colitti
a9549e4275
[automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours
...
am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 b4bf015b57 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383
Change-Id: I49a1191f13e16e8c4cbea74cff913f03453168bd
2021-06-14 06:03:47 +00:00
Lorenzo Colitti
cd60e94a2c
Merge changes I944f4c6a,I69cf58bc into sc-dev
...
* changes:
Don't send onLinkPropertiesChanged after onLost for 464xlat.
Improve test coverage for disconnecting networks with clat.
2021-06-14 05:51:54 +00:00