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
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
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
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
Lorenzo Colitti
8c0aaba806
Improve test coverage for disconnecting networks with clat. am: cfa262d8b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382
Change-Id: I081e690c3d3afd1bd0e73d2869172d229863baef
2021-06-14 06:04:58 +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
Sudheer Shanka
f3d8c6f70e
Avoid waiting unnecessarily if there is no data to return.
...
Bug: 189790442
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I091991aac8eb11319bd60dc8f07124ace1ad52f1
2021-06-14 03:13:41 +00:00
Luke Huang
7aad6dd5fc
Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca am: 614299c262
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018
Change-Id: I0aa928303428b875c0be0618e04d5940b1b26eed
2021-06-13 17:39:41 +00:00
Luke Huang
614299c262
Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018
Change-Id: I2fb0ac98d2f7ae2a2fab3af7bc657f013b59bbc2
2021-06-13 16:52:06 +00:00
Luke Huang
31f8527bca
Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018
Change-Id: I7f81b5f807114c223f53fe8417d904c4dbe5cb39
2021-06-13 16:09:50 +00:00
Luke Huang
c9a2bdf2b9
Merge "Modify NsdServiceTest to conform to its new mechanism"
2021-06-13 15:20:52 +00:00
Frank Li
9dd2f85c82
Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6 am: 2348b4a8ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395
Change-Id: Ia7dafe703e9ff2579c57e3a2d130ac6db2e47d46
2021-06-12 13:39:35 +00:00
Frank Li
2348b4a8ae
Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395
Change-Id: Ib6eb34ccff924606dc404076f4421e62d13e902d
2021-06-12 13:25:22 +00:00
Frank Li
2cb6dca3f6
Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395
Change-Id: I2ce2517dd8657316d9d8e57e85cf1d8026845be6
2021-06-12 13:14:36 +00:00
Frank Li
67fe28455d
Merge "Add test for ConnectivityService API isPrivateDnsBroken"
2021-06-12 13:02:24 +00:00
Yan Yan
29487b12d5
Set up and tear down test network in TestNetworkRunnable
...
Allow test caller to construct a TestNetworkRunnable to run a
test with a test network.
This is a preparation for adding tests to verify kernel
implementation of IPsec algorithms.
Bug: 171083832
Test: atest Ikev2VpnTest
Change-Id: I0e08a6ea299e6ad94d69806a2d76fa155653b62a
2021-06-11 11:27:44 -07:00
TreeHugger Robot
796ddc71cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: d033292467 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623
Change-Id: Ia2c67638f31dae6d504f77a30f5d036bc477fd2a
2021-06-11 17:52:43 +00:00
TreeHugger Robot
f9f1101006
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: 07478c2a7b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623
Change-Id: I117702539d9fb8a31a42170f400c1516913d0ccd
2021-06-11 17:45:13 +00:00
TreeHugger Robot
d033292467
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623
Change-Id: I312ea41fb1556dcfc23d1ce2ec2e214022a90f79
2021-06-11 17:35:44 +00:00