Commit Graph

998 Commits

Author SHA1 Message Date
Lorenzo Colitti
0935eacf6e [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf -s ours am: 136a64f089 -s ours am: 9dc4208520 -s ours am: 65fb797c6d -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 46b44053da is in history

Change-Id: Ib41629d438f06256ebefe846b7dbf54ee6b086d9
2020-04-07 05:45:41 +00:00
Lorenzo Colitti
f7511305ed [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf am: 40cb9442db -s ours am: d7a01926c1 -s ours am: 2002df104f -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 0a61e95319 is in history

Change-Id: I80f151a7e04acd0203e79320bb54e6b48f940bee
2020-04-07 05:45:03 +00:00
Lorenzo Colitti
65fb797c6d [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf -s ours am: 136a64f089 -s ours am: 9dc4208520 -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 46b44053da is in history

Change-Id: I95f75fefa37c33b31d86c867de3314cf0bb2cd0a
2020-04-07 05:31:16 +00:00
Lorenzo Colitti
2002df104f [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf am: 40cb9442db -s ours am: d7a01926c1 -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 0a61e95319 is in history

Change-Id: Ie2df55e7eb8a0f838632cfa697906c4c60440469
2020-04-07 05:30:42 +00:00
Lorenzo Colitti
9dc4208520 [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf -s ours am: 136a64f089 -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 46b44053da is in history

Change-Id: I9031b17d9d3b7e47a358cf52ae20125e068395ff
2020-04-07 05:06:53 +00:00
Lorenzo Colitti
d7a01926c1 [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf am: 40cb9442db -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 0a61e95319 is in history

Change-Id: I712052082ebed57caf4564c0e21923f183081533
2020-04-07 05:06:42 +00:00
Lorenzo Colitti
40cb9442db Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf
Change-Id: Ic8a461333b73f9bcc51480aea0387a4573e2e2ef
2020-04-07 04:48:39 +00:00
Lorenzo Colitti
136a64f089 [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 0a61e95319 is in history

Change-Id: I70e18ba92ea1ac35b678dbee6d8a44cfce493f79
2020-04-07 04:48:22 +00:00
Lorenzo Colitti
303e9bdddf Merge "Use CompletableFuture instead of a latch." into rvc-dev 2020-04-07 04:30:33 +00:00
Xiao Ma
1913b224b7 [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 am: 98c72a1b58 am: fe058ccca2 -s ours am: c29a8feb32 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 06c8ba0cd7 is in history

Change-Id: Ic1153cffb563fd03b211ac9eb4b2ec2d9f03c0cb
2020-04-07 04:21:35 +00:00
Xiao Ma
4c45d88fbe [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa -s ours am: 389cfdc8e1 -s ours am: 6223734abc -s ours am: f0b7bf1306 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 06c8ba0cd7 is in history

Change-Id: Ied959cdb1a1e419a853285ef4472b145c4fd60a2
2020-04-07 04:21:08 +00:00
Automerger Merge Worker
dfe1dc117d Merge "[automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 -s ours" into rvc-d1-dev-plus-aosp am: 0b4c2c7046 -s ours am: b0fc5039ee -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 49889dd4c0 is in history

Change-Id: Ic750edef8fdc66d06805f89c998062cc52e10ae5
2020-04-07 04:20:23 +00:00
Xiao Ma
c29a8feb32 [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 am: 98c72a1b58 am: fe058ccca2 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 06c8ba0cd7 is in history

Change-Id: Ic122ef3e60d607b4679808a46bd711f3efc51973
2020-04-07 04:19:54 +00:00
Xiao Ma
f0b7bf1306 [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa -s ours am: 389cfdc8e1 -s ours am: 6223734abc -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 06c8ba0cd7 is in history

Change-Id: Idc656c11fd0179d8918eaad80517e2bceb456db8
2020-04-07 03:59:13 +00:00
Automerger Merge Worker
b0fc5039ee Merge "[automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 -s ours" into rvc-d1-dev-plus-aosp am: 0b4c2c7046 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 49889dd4c0 is in history

Change-Id: I09d7d0be2a4e7be49d7e0226ab195d1af0e4fac4
2020-04-07 03:58:45 +00:00
Xiao Ma
fe058ccca2 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 am: 98c72a1b58
Change-Id: Ic5d132f2d5347c6975203e6441774ddbe7f4334d
2020-04-07 03:57:17 +00:00
Xiao Ma
6223734abc [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa -s ours am: 389cfdc8e1 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 06c8ba0cd7 is in history

Change-Id: I3b6954051f859e83f5c48d3232d5265ee6d3c285
2020-04-07 03:38:53 +00:00
Xiao Ma
46e52b0f0e [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa am: f8006ef1b9 -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 49889dd4c0 is in history

Change-Id: I9e753580784dafb122326b9e8e2405e20cecc23b
2020-04-07 03:38:09 +00:00
Lorenzo Colitti
f952f95f50 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 am: a785b84ff1 am: c8d2c484c6 -s ours am: 7f1de9f772 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 e6107d2466 is in history

Change-Id: Id19d6cac3b3ddab73f14f77a07ca0144a8885f02
2020-04-07 03:21:21 +00:00
Xiao Ma
f8006ef1b9 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa
Change-Id: I197cbda4504cbc6ca3148dec6c31f58b995ed752
2020-04-07 03:17:41 +00:00
Lorenzo Colitti
7f1de9f772 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 am: a785b84ff1 am: c8d2c484c6 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 e6107d2466 is in history

Change-Id: I3026c7d48dba654bed3e2679ecf24b358f122229
2020-04-07 03:17:22 +00:00
Xiao Ma
389cfdc8e1 [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 49889dd4c0 is in history

Change-Id: Ifdedc3ae90e7bf4aeb9970cdd4b04cecdf625e19
2020-04-07 03:16:25 +00:00
Lorenzo Colitti
9c03473be7 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 -s ours am: fd997f3c45 -s ours am: f5ea2f43cb -s ours am: 0a4bc3adb7 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 e6107d2466 is in history

Change-Id: I10a0612cba043cda03042f0d9a03474fb7ad14c7
2020-04-07 03:06:55 +00:00
Automerger Merge Worker
7a0e7a018c Merge "[automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 -s ours" into rvc-d1-dev-plus-aosp am: 233237f665 -s ours am: 12e90a177f -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 beb28405b1 is in history

Change-Id: I8203d78b556e55b1983cbf1cd3d23527c2494fca
2020-04-07 03:06:31 +00:00
Lorenzo Colitti
0a4bc3adb7 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 -s ours am: fd997f3c45 -s ours am: f5ea2f43cb -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 e6107d2466 is in history

Change-Id: If4578241b672bf51ffdf64191367498f52ba3722
2020-04-07 02:55:37 +00:00
Automerger Merge Worker
12e90a177f Merge "[automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 -s ours" into rvc-d1-dev-plus-aosp am: 233237f665 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 beb28405b1 is in history

Change-Id: I33d8cda8c68bad7bee5d3fbc9ed04c72bd01da53
2020-04-07 02:54:39 +00:00
Lorenzo Colitti
c8d2c484c6 Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 am: a785b84ff1
Change-Id: I07e77d16b2c1ff79811af086c4306792aaef924f
2020-04-07 02:53:40 +00:00
Xiao Ma
210adac5fa Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev 2020-04-07 02:50:41 +00:00
Lorenzo Colitti
f5ea2f43cb [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 -s ours am: fd997f3c45 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 e6107d2466 is in history

Change-Id: Ic13937dabec59fb83084dca2aa2e7286bbf0b0db
2020-04-07 02:37:04 +00:00
Lorenzo Colitti
089e2958ec [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: 5d92c17700 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 beb28405b1 is in history

Change-Id: I89661628511ffd0720706d1b26ea81fcb82cd2c4
2020-04-07 02:36:55 +00:00
Lorenzo Colitti
46b44053da Use CompletableFuture instead of a latch.
Addresses review comments on aosp/1260100.

Bug: 150644681
Test: test-only change
Merged-In: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
Change-Id: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
2020-04-07 02:20:35 +00:00
Lorenzo Colitti
5d92c17700 Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343
Change-Id: I288bd790c246de068c6143932fa312a7662a24f7
2020-04-07 02:15:42 +00:00
Lorenzo Colitti
fd997f3c45 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 beb28405b1 is in history

Change-Id: I11f1e9b9df4e7c2111b6d9f0e5b6c25ec0150e69
2020-04-07 02:15:27 +00:00
Xiao Ma
06c8ba0cd7 Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.
Bug: 130741856
Test: atest TetheringTests
Merged-In: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
2020-04-07 01:26:50 +00:00
Mark Chien
ee06f2a4fc Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8 am: 258d28303e am: cee4c931b1 am: 968baf0e2c
Change-Id: I1ba30bb524cbc0cc2782ce1702f9889c0d8a7576
2020-04-06 16:59:51 +00:00
Mark Chien
968baf0e2c Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8 am: 258d28303e am: cee4c931b1
Change-Id: Id044204f124cabc1190387c1dbf081af2f26726f
2020-04-06 16:37:36 +00:00
Mark Chien
cee4c931b1 Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8 am: 258d28303e
Change-Id: I5ff4077dda5a268fc980dddfa0e4737eec3267f1
2020-04-06 16:21:28 +00:00
Mark Chien
258d28303e Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8
Change-Id: I5b38a893522fcea37f757c7d7234d07e3176fe1b
2020-04-06 15:59:56 +00:00
Mark Chien
173e69b2a8 Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444
Change-Id: I27ce7e0fd3f061349838ef6206c8d77eb2231498
2020-04-06 15:48:56 +00:00
Lorenzo Colitti
e6107d2466 Migrate to TetherOffloadRuleParcel in IpServer
The netd tethering offload IPCs are changing from taking a list
of primitives to taking a TetherOffloadRuleParcel. Modify their
only caller.

Bug: 140541991
Test: atest IpServerTest
Merged-In: I83718c80ef9d31199c87021b4dd5821717fd5ba5
Change-Id: I83718c80ef9d31199c87021b4dd5821717fd5ba5
2020-04-06 15:45:58 +00:00
Xiao Ma
4b5930b22e Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be am: 9558865f76 am: e1c2e2b354 am: 84b5603330
Change-Id: I6d837dd44f89913b5e6e5a4d394d38b5478220f8
2020-04-06 15:44:48 +00:00
Lorenzo Colitti
387241de01 Merge "Migrate to TetherOffloadRuleParcel in IpServer" am: b22a70d7c8 am: 2aea86b521 am: dc25174ebe am: 661f191c3b am: bb1ae69738
Change-Id: Id55be8ade5abc761fb14d40f7b39e2b047e86260
2020-04-06 15:41:30 +00:00
Mark Chien
7b4fb08444 Merge "Add IPv6TetheringCoordinator unit test" 2020-04-06 15:25:37 +00:00
Xiao Ma
84b5603330 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be am: 9558865f76 am: e1c2e2b354
Change-Id: I4098084282a01241bddae9e5e053941dab3ec998
2020-04-06 15:24:46 +00:00
Lorenzo Colitti
bb1ae69738 Merge "Migrate to TetherOffloadRuleParcel in IpServer" am: b22a70d7c8 am: 2aea86b521 am: dc25174ebe am: 661f191c3b
Change-Id: Ife810c6d1762c99a77f16fa37086d03b7a8a2597
2020-04-06 15:21:35 +00:00
Xiao Ma
e1c2e2b354 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be am: 9558865f76
Change-Id: I7dbb29c4c4387f63ed5cb5016de0c3aee58a4197
2020-04-06 11:43:14 +00:00
Xiao Ma
9558865f76 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be
Change-Id: Ib5be6794077c5e932fdf4bfc93fab822e6cb70d7
2020-04-06 11:24:48 +00:00
Xiao Ma
d0b65f11be Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18
Change-Id: I735c1c19a6255bdfd0fa09050dbb403fd9e43c7a
2020-04-06 11:02:14 +00:00
Xiao Ma
a73e5c5c18 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." 2020-04-06 10:43:28 +00:00
markchien
1b39a10c21 Add IPv6TetheringCoordinator unit test
Bug: 148636687
Test: atest IPv6TetheringCoordinatorTest
Change-Id: I939323ce09adb9c66b1e2b83d58b0f892aa8f011
2020-04-06 18:25:41 +08:00