Commit Graph

10154 Commits

Author SHA1 Message Date
Bruce Chen
e588cac100 Merge "Add testTransportTypesEqual to dnsmanager test cases" am: 6423924637 am: 986d8e2864 am: 181c58eeee am: 24d741a346 am: 1dabf2d57a
Change-Id: I3dd4ed0d1fcceca9c8aec9b3e6769603e4fa913b
2020-04-17 04:28:04 +00:00
Bruce Chen
1dabf2d57a Merge "Add testTransportTypesEqual to dnsmanager test cases" am: 6423924637 am: 986d8e2864 am: 181c58eeee am: 24d741a346
Change-Id: Iacaf8157b654554a11200d494e85173777652710
2020-04-17 04:15:33 +00:00
Bruce Chen
24d741a346 Merge "Add testTransportTypesEqual to dnsmanager test cases" am: 6423924637 am: 986d8e2864 am: 181c58eeee
Change-Id: I4d6bfe5809198c006fa89c4d7439c0af1723261c
2020-04-17 03:52:12 +00:00
Junyu Lai
1c428ca413 [automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 3c0090f7be am: 3d574722a7 -s ours am: cee1330080 -s ours am: efb338d9f9 -s ours am: be089219d8 -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 66e2bcd843 is in history

Change-Id: I2b5a9351f3fddb5f78bbfe1ff49f98d2bae040f8
2020-04-17 03:48:25 +00:00
Bruce Chen
181c58eeee Merge "Add testTransportTypesEqual to dnsmanager test cases" am: 6423924637 am: 986d8e2864
Change-Id: I0ccca97191773aa77d1c85481d73e0adaf1d0b7a
2020-04-17 03:38:52 +00:00
Junyu Lai
be089219d8 [automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 3c0090f7be am: 3d574722a7 -s ours am: cee1330080 -s ours am: efb338d9f9 -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 66e2bcd843 is in history

Change-Id: If147bd623d0bc9b57244b427546c7e56f54275ad
2020-04-17 03:23:51 +00:00
Bruce Chen
986d8e2864 Merge "Add testTransportTypesEqual to dnsmanager test cases" am: 6423924637
Change-Id: Idae99c5d19fcffdaf568b79aaa3e1679347ea655
2020-04-17 03:23:18 +00:00
Junyu Lai
efb338d9f9 [automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 3c0090f7be am: 3d574722a7 -s ours am: cee1330080 -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 66e2bcd843 is in history

Change-Id: I4bb3ceed39ac05828589fd423a3a28c118ab5d7d
2020-04-17 03:06:46 +00:00
Bruce Chen
6423924637 Merge "Add testTransportTypesEqual to dnsmanager test cases" 2020-04-17 02:59:15 +00:00
Junyu Lai
cee1330080 [automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 3c0090f7be am: 3d574722a7 -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 66e2bcd843 is in history

Change-Id: I5e14eec3e2a8af779c04801e9dabaa312db6ae08
2020-04-17 02:49:22 +00:00
Junyu Lai
3d574722a7 Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 3c0090f7be
Change-Id: If3f447e3029c3ccb9a21e00257f596dd690ef55a
2020-04-17 02:26:28 +00:00
Junyu Lai
3c0090f7be Merge "[SP27.3] Rename TestableNetworkStatsProvider" 2020-04-17 02:24:55 +00:00
Lorenzo Colitti
c7fcb0b837 Merge "Add a function to process LinkProperties coming from an agent." am: 1e0ebcec4a am: 6c933e64e2 am: 35b35184fc am: 61411e46de am: 54f8b55755
Change-Id: I2c2b0cdd0677aa73c2c97a9280fb8f422ac2dc1f
2020-04-16 17:20:01 +00:00
Lorenzo Colitti
0b009c54bf Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0 am: b2023231f8 am: d119f4a9c1
Change-Id: I22a4393f70b545dd7b9588bdb674f0684d73e45c
2020-04-16 17:19:35 +00:00
Lorenzo Colitti
54f8b55755 Merge "Add a function to process LinkProperties coming from an agent." am: 1e0ebcec4a am: 6c933e64e2 am: 35b35184fc am: 61411e46de
Change-Id: I28269a36472d76139c854fe54b3059b2c48f4cd2
2020-04-16 17:08:30 +00:00
Lorenzo Colitti
d119f4a9c1 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0 am: b2023231f8
Change-Id: Ic82307541b72ea8efa470d13c086016abafe4d9a
2020-04-16 17:08:20 +00:00
Lorenzo Colitti
61411e46de Merge "Add a function to process LinkProperties coming from an agent." am: 1e0ebcec4a am: 6c933e64e2 am: 35b35184fc
Change-Id: I79478ed06ec7b4274512a7e9fa686305230474c4
2020-04-16 16:56:36 +00:00
Lorenzo Colitti
b2023231f8 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0
Change-Id: I61c2f5c46e4e968ab1777432042b615186829cba
2020-04-16 16:56:20 +00:00
Lorenzo Colitti
35b35184fc Merge "Add a function to process LinkProperties coming from an agent." am: 1e0ebcec4a am: 6c933e64e2
Change-Id: I66bc26522eb29666424db507437c83e0ab2a0b4d
2020-04-16 16:49:56 +00:00
Lorenzo Colitti
18b08e6bd0 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f
Change-Id: I19050527eb41a58c7844972f34e92719d2344c27
2020-04-16 16:49:33 +00:00
Lorenzo Colitti
6c933e64e2 Merge "Add a function to process LinkProperties coming from an agent." am: 1e0ebcec4a
Change-Id: I7691b297b27065018e79b1808e35f9a02104a150
2020-04-16 16:38:01 +00:00
Lorenzo Colitti
a3004f7d2f Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0
Change-Id: I2616aba51bdad9afa2dddf6011355f14e4b5457e
2020-04-16 16:37:08 +00:00
Lorenzo Colitti
1e0ebcec4a Merge "Add a function to process LinkProperties coming from an agent." 2020-04-16 16:25:29 +00:00
Lorenzo Colitti
fa6b37b1e0 Merge "Support changing the NAT64 prefix without removing it." 2020-04-16 16:24:57 +00:00
chenbruce
366d6f9ada Add testTransportTypesEqual to dnsmanager test cases
A test that ensures that NetworkCapabilities.TRANSPORT_* is eaual
to IDnsResolver.TRANSPORT_* for every possible value of each.

Bug: 153267602
Test: atest FrameworksNetTests
Change-Id: I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417
2020-04-16 18:04:16 +08:00
Lorenzo Colitti
1b6f19d003 Add a function to process LinkProperties coming from an agent.
There are tasks that need to be performed when receiving
LinkProperties directly from a NetworkAgent (either at
registration time or in subsequent updates).

Currently, the only example of such a task is calling
ensureDirectlyConnectedRoutes. This is currently done in
handleUpdateLinkProperties, which is often unnecessary,
because that method iscalled in many other cases than when
receiving properties directly from an agent. Ensuring directly
connected routes only needs to be done when receiving
LinkProperties from the agent, because ConnectivityService does
not directly manipulate routes.

This CL does not do much except remove these superfluous calls
and add the method. A future CL will add more code to the method.

Bug: 150648313
Test: atest ConnectivityServiceTest
Change-Id: Ibeeb5f79e8afd3350c935934713d7882f2e0281f
2020-04-16 16:23:07 +09:00
Junyu Lai
97b93981e7 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours am: d9884144ca -s ours am: c055fc3cdb -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I286546740d259790e5153d8e9c565762fd46dda1
2020-04-16 00:18:43 +00:00
Junyu Lai
588da3d18a [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: e382873224 -s ours am: f0b0ca28e7 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I65040c118cde06339e9b221c557b314d205aa60e
2020-04-16 00:07:07 +00:00
Junyu Lai
9684e28e61 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb am: fc3756edcf am: a9f44b56f4
Change-Id: Ia70ccf7fe8bb7b44640db59ad00d5150af546f0e
2020-04-16 00:05:35 +00:00
Automerger Merge Worker
6b138f6aae Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a" into rvc-d1-dev-plus-aosp am: 2674aa108b am: 6f8d03fdd9
Change-Id: I4c047ce968b7f701f3bc718511b969d4b7d7e84c
2020-04-16 00:05:16 +00:00
Junyu Lai
7fccaedcdb [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: edd5229bb5 am: b3e4446eb3 am: fa228a0156 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 9f2e38da19 is in history

Change-Id: I019d6fa102815a24711aea617a51aca2364b6a6d
2020-04-15 23:54:55 +00:00
Junyu Lai
35266e7f65 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a am: 0bce5338ac am: 6afc29bd6f am: 37f08a3ef0
Change-Id: Iefc604fe82b124ef5bfe8b4651456a2fa7813e08
2020-04-15 23:53:28 +00:00
Junyu Lai
c055fc3cdb [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours am: d9884144ca -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I8af177e7714eeed230a0781016e240ebce6e95eb
2020-04-15 19:13:47 +00:00
Junyu Lai
f0b0ca28e7 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: e382873224 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: Iac21e8421c0de2ef41edd1ac82488c352029631a
2020-04-15 19:00:17 +00:00
Junyu Lai
a9f44b56f4 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb am: fc3756edcf
Change-Id: Icf88c06793586dd4cb04f65d24cc9792953ee8d5
2020-04-15 18:58:04 +00:00
Automerger Merge Worker
6f8d03fdd9 Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a" into rvc-d1-dev-plus-aosp am: 2674aa108b
Change-Id: I852222487a3e8552e6cde374af718dcd1975618a
2020-04-15 18:57:42 +00:00
Junyu Lai
fa228a0156 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: edd5229bb5 am: b3e4446eb3
Change-Id: I8c4e71f3d64b6cea509d5e8654ed919fcf7d4108
2020-04-15 18:49:11 +00:00
Junyu Lai
37f08a3ef0 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a am: 0bce5338ac am: 6afc29bd6f
Change-Id: I084adb9cdbe2093bb2f94e7b5f75048496b63d7f
2020-04-15 18:48:03 +00:00
Junyu Lai
d9884144ca [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: Idade28f3ca80b48d8d56d3584cbf195c2f250c40
2020-04-15 17:58:23 +00:00
Junyu Lai
e382873224 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5
Change-Id: I883b3b8d699bda1b640992b621b547048f057807
2020-04-15 17:48:41 +00:00
Junyu Lai
fc3756edcf Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb
Change-Id: I06ac6c1a3090a3ac52270f92e7d717ef8107af98
2020-04-15 17:47:59 +00:00
Junyu Lai
6e11dde9ac Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a
Change-Id: I04a4ebcc5ef0ece209722a27b91c46f8c483bda0
2020-04-15 17:47:51 +00:00
Junyu Lai
8a4693e56c Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4
Change-Id: I5dd2e734cd8ce6637c39e57a6b302447bc0f295f
2020-04-15 17:26:19 +00:00
Junyu Lai
ce5c0b74c5 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4
Change-Id: I6cfb8d5a6d1306200d63afa6770df89472bd2f81
2020-04-15 17:26:05 +00:00
Junyu Lai
4c4e75324a Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb
Change-Id: I5f1820bc4487bea25b75e1b82365d6833372b0c3
2020-04-15 17:25:21 +00:00
Junyu Lai
a48e0b2acb Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb
Change-Id: Ice8c64d926e026ebc9d993330a84d57007782a99
2020-04-15 17:24:41 +00:00
Lorenzo Colitti
b3e329c4b3 Support changing the NAT64 prefix without removing it.
This cannot (currently) happen with DNS64 detection, but it can
happen with the PREF64 option.

Bug: 150648313
Test: atest ConnectivityServiceTest Nat464XlatTest --rerun-until-failure 100
Change-Id: I789fe9d46d3ac5d074ae697d23013f24a9e0246d
2020-04-16 00:07:30 +09:00
Junyu Lai
e63d990bb4 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev 2020-04-15 11:49:01 +00:00
junyulai
b4870a31b7 [SP27.3] Rename TestableNetworkStatsProvider
Currently, TestableNetworkStatsProvider is a subclass of
INetworkStatsProvider. This is not very accurate naming after
API council review feedback since now we have
NetworkStatsProvider as a system api interface.

This is the counter-part change of actual renaming CL in
NetworkStack.

Test: atest FrameworksNetTests TetheringTests
Bug: 150643374
Change-Id: Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7
Merged-In: Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7
(cherry-picked from ag/10976522)
2020-04-15 19:01:13 +08:00
Junyu Lai
6d1c9246fb Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev 2020-04-15 10:44:23 +00:00