Cody Kesting
458e65374b
[automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b am: 7ca2e36684 -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: Idf8100ac584d85c137190ef0182a63cb67b66d46
2021-06-15 05:02:27 +00:00
Treehugger Robot
0f0d28d58b
[automerger skipped] Fully setup test TUN iface on create. am: 5cbd7b38ca am: ac39fac427 -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: I7fbbe2da9a0086da40a276c8d940fbf76d5b5b97
2021-06-15 05:02:23 +00:00
Cody Kesting
7ca2e36684
Keep subIds for Test NetworkCapabilities. am: f5a4fb124b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444
Change-Id: I8d36d0bf7cbf229710d1c5d69e54b737f3919ec0
2021-06-15 04:50:07 +00:00
Treehugger Robot
ac39fac427
Fully setup test TUN iface on create. am: 5cbd7b38ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443
Change-Id: I6937e841f5213cc6a5705853a44ca7e519158d44
2021-06-15 04:50:05 +00:00
Paul Hu
71b732397a
[automerger skipped] Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d am: 136bd35a67 -s ours am: 36df497e05 -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: I883e7e9330f569a181dc7b1a12ecd300eb2d1231
2021-06-15 03:17:34 +00: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
980391c494
[automerger skipped] Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0 am: c639d88a44 -s ours am: 364b86affe -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: Ie6ed625735f40f68ad2c2ff62be50f209ff4f915
2021-06-15 02:08:26 +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
fa7d3b3905
Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120 am: 83f08bd8ee am: 8f12415e51
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692
Change-Id: I6fb2a89664c43f5e5e7d87f32536d922d12d02b9
2021-06-15 01:27:24 +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
a275826eb6
Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad am: f92b7d2eb8 am: e92ac168d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793
Change-Id: I556d99489a580c0c563cbaa942dcdcc2e585d3a2
2021-06-14 20:07:10 +00:00
Treehugger Robot
bff8161a27
Merge "Fully setup test TUN iface on create." am: 6c0525fbd5 am: 4b8900e520 am: 5179e12560
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719792
Change-Id: I5215a84c06ff08a8d90bd47654b4e63187ef9e8e
2021-06-14 20:06:55 +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
Sudheer Shanka
f134b2627a
Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71 am: 16063e8281 am: 7b45312b50
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977
Change-Id: I1129200df33fb3ffadf45b92dc03432ff6eaf50f
2021-06-14 19:33:41 +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
Paul Hu
2f14249a7d
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf am: 98ab75c109
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886
Change-Id: I5dfb9c1d5d023fee9a216999115d395a4a56b8a4
2021-06-14 15:54:07 +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
af3798b8e5
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf am: ab4b8bc600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886
Change-Id: If462f369e2cf7a74a0a5895073743e27f832ac0e
2021-06-14 15:49:38 +00:00
Paul Hu
98ab75c109
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: I1226c1d512e252ebbbde56e1d144e0072e941e43
2021-06-14 15:36:35 +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
956a745b0c
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d am: 31c7026ff9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884
Change-Id: Ibdabad67e50a184f330ed884c6acb99ca2602959
2021-06-14 15:02:52 +00:00
Paul Hu
714af33653
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d am: fccce46a7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884
Change-Id: I616f67b162618e7b195adf167cbaa62990c3ff50
2021-06-14 15:02:30 +00:00
Paul Hu
fccce46a7c
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: I89634550c0e426be5419ffcc2ff066225446aa5a
2021-06-14 14:48:29 +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
Lorenzo Colitti
4b80e297e7
Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026 am: 9088465b13
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617
Change-Id: I90636ede4f7136f475b992b0a2319fcb10e195d6
2021-06-14 06:45:17 +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
2f0f28f8c5
[automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours am: a9549e4275 -s ours
...
am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 beb7d92cbc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383
Change-Id: I6cf14dc358c2adbb6587c3fec086f1e8d6115519
2021-06-14 06:14:55 +00:00
Lorenzo Colitti
b02e49ae01
[automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c am: e85cf9b23d -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: I5ffec9d532dac61fbd34f521d7aa8ea75d58bddd
2021-06-14 06:14:40 +00:00
Lorenzo Colitti
5daa9dd9e1
[automerger skipped] Improve test coverage for disconnecting networks with clat. am: cfa262d8b8 am: 8c0aaba806 -s ours
...
am skip reason: Merged-In I69cf58bc87dfe55ea359a2cd76167d03fe2c953d with SHA-1 284ca22f0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382
Change-Id: I32f355fb3a873b88b6fbf2d574e66d362b32173c
2021-06-14 06:14:36 +00:00
Lorenzo Colitti
473ddeaebb
Merge "Correctly get uids for per-app network preferences"
2021-06-14 06:07:56 +00:00
Lorenzo Colitti
e85cf9b23d
Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383
Change-Id: I580752faf2023115140dfecd1b6de09392203a4d
2021-06-14 06:05:00 +00:00