Commit Graph

1015 Commits

Author SHA1 Message Date
Paul Hu
ab51eeef21 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 -s ours am: cb7f6b0bb1 -s ours am: e0592710eb -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 4175676eab is in history

Change-Id: Ib2519e47c8fdd347339ba27d113c1a40b66db33d
2020-04-07 05:47:24 +00:00
Lorenzo Colitti
e4c07c5135 [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: d96e7ada65 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 7f6ab40294 is in history

Change-Id: Iaee625fa6684a7bf62facc18d12cfcd15ce3b1cb
2020-04-07 05:46:48 +00:00
Automerger Merge Worker
5e3e42fb4b 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: de9d32beb5 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 cfd82d4361 is in history

Change-Id: Iba321656d8d6eccd8c8461e7bef04d982bab1168
2020-04-07 05:46:31 +00:00
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
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
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
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
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
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
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
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