Commit Graph

1530 Commits

Author SHA1 Message Date
Mark Chien
76161686ff [automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb -s ours
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21 is in history

Change-Id: I5e357f2e0446b6ad088fb9ac2835094fdbb34c15
2020-04-07 08:10:57 +00:00
Mark Chien
21b7d260cb Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8
Change-Id: Ic4a4803bea140bc567e9a2a3e35a40652e7285be
2020-04-07 07:59:50 +00:00
Mark Chien
164ec44482 [automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21 is in history

Change-Id: Iecc2dfebddec5cf1e6e79ea0bdeffba386462cfd
2020-04-07 07:59:18 +00:00
Mark Chien
8caf921dc8 Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev 2020-04-07 07:50:40 +00:00
Paul Hu
80b423ee36 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 am: 53ee61ff48 am: 8ed40cc267 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 bd8d7a8208 is in history

Change-Id: Iba7ba462148baf982493dc6bf3b3132ee30cfa47
2020-04-07 05:38:40 +00:00
Lorenzo Colitti
46a3836cee [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 am: eb643867bb am: 2ea294e68c am: f147b62dd6 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 7f6ab40294 is in history

Change-Id: If007ff14e5b9ec59192fff0c73867b518d73140e
2020-04-07 05:38:25 +00:00
Lorenzo Colitti
ebcef8c9fc [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf am: 40cb9442db am: 67516cf431 am: eed3de2b33 -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 46b44053da is in history

Change-Id: I353843c9daa446f0ac2cf62be23d4ebae606ce7e
2020-04-07 05:38:06 +00:00
Paul Hu
280736dfde [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 -s ours am: 102d1715d0 -s ours am: ee1a147cf5 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 bd8d7a8208 is in history

Change-Id: I69b1de11bbd738fbae929c42e1614957693d294c
2020-04-07 05:34:21 +00:00
Paul Hu
e0592710eb [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 -s ours am: cb7f6b0bb1 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 4175676eab is in history

Change-Id: I56c84f70c7d238540384ccaa87b9a24a0863bd72
2020-04-07 05:33:37 +00:00
Lorenzo Colitti
d96e7ada65 [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 -s ours am: 19d7f88707 -s ours am: 842653f85f -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 7f6ab40294 is in history

Change-Id: Ie4430abb6d9be6e37bcbd84e6cbab3fe758119e5
2020-04-07 05:32:53 +00:00
Automerger Merge Worker
de9d32beb5 Merge "[automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 am: eb643867bb -s ours" into rvc-d1-dev-plus-aosp am: 4fe157b63d -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 cfd82d4361 is in history

Change-Id: I6984bcf8d6115de12f712dc7e5f795fc7d593ca7
2020-04-07 05:32:22 +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
Paul Hu
8ed40cc267 Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 am: 53ee61ff48
Change-Id: I0d11825de0cef6632c86f9087a0d8797f4d7a28e
2020-04-07 05:25:01 +00:00
Lorenzo Colitti
f147b62dd6 Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 am: eb643867bb am: 2ea294e68c
Change-Id: Ifd5e4c09ff6a065c2514231d1d430cdbd425bdc2
2020-04-07 05:24:16 +00:00
Lorenzo Colitti
eed3de2b33 Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf am: 40cb9442db am: 67516cf431
Change-Id: I46f87c5e032d8d34e2804928a42e500140ccd2bc
2020-04-07 05:23:24 +00:00
Paul Hu
ee1a147cf5 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 -s ours am: 102d1715d0 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 bd8d7a8208 is in history

Change-Id: I907a2a91163ff0533961e28901464da8bec2a2c0
2020-04-07 05:08:02 +00:00
Paul Hu
cb7f6b0bb1 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 4175676eab is in history

Change-Id: Ib396af9574b8ae6a07297a9a171f5da7bdac3ada
2020-04-07 05:07:44 +00:00
Lorenzo Colitti
842653f85f [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 -s ours am: 19d7f88707 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 7f6ab40294 is in history

Change-Id: Ie316abd3a0081484f291919e69e36aeca9c42be0
2020-04-07 05:07:35 +00:00
Automerger Merge Worker
4fe157b63d Merge "[automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 am: eb643867bb -s ours" into rvc-d1-dev-plus-aosp 2020-04-07 05:07:13 +00:00
Lorenzo Colitti
6ca0013ecb [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 am: eb643867bb -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 cfd82d4361 is in history

Change-Id: I644fb88ffb26f405aa5cbba492b454f244c24842
2020-04-07 05:07:03 +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
Paul Hu
f4ba82a587 Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165
Change-Id: I4604c7e324757e738fdaec2d2d9f0b351086a7e1
2020-04-07 04:49:37 +00:00
Paul Hu
102d1715d0 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 4175676eab is in history

Change-Id: I5f0b11ed607b77658c34f774cbe96d1e45fdeaad
2020-04-07 04:49:33 +00:00
Lorenzo Colitti
19d7f88707 [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 cfd82d4361 is in history

Change-Id: I62b9ee8fbf3bce45c349ca23cc056c9d86466a4e
2020-04-07 04:49:14 +00:00
Lorenzo Colitti
eb643867bb Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968
Change-Id: I6d7542d085d15969007862aa60ac3b723ca109db
2020-04-07 04:49:06 +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
Paul Hu
aaf92e5165 Merge "Fix EntitlementManager issues" into rvc-dev 2020-04-07 04:37:30 +00:00
Mark Chien
5e9e0337c5 Add IPv6TetheringCoordinator unit test
Bug: 148636687
Test: atest IPv6TetheringCoordinatorTest

Change-Id: I1ba30bb524cbc0cc2782ce1702f9889c0d8a7576
Merged-In: I939323ce09adb9c66b1e2b83d58b0f892aa8f011
(cherry picked from commit 368c56dd7133d292c5f3ab5942016bb4dd1fbc88)
2020-04-07 04:33:24 +00:00
Lorenzo Colitti
6343b0c968 Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev 2020-04-07 04:30:58 +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
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
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
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
7f6ab40294 Add a test for static IPv4 address tethering configuration.
Bug: 150644681
Test: test-only change
Merged-In: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
2020-04-07 02:21:00 +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