Commit Graph

755 Commits

Author SHA1 Message Date
Luke Huang
bf63b45e7f [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours am: 970a18a828 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: I40105154ad0ddba88d883bf18702c322785a8665
2020-04-10 08:42:24 +00:00
Luke Huang
970a18a828 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: Ib1f389f3359d3be6d8660add26377a5a4e1906c2
2020-04-10 08:31:31 +00:00
Luke Huang
d20078112b Use the lastest frozen netd_aidl_interface in framework
Bug: 140541991
Test: build
Merged-In: I984969e09f8d5196945a7412c51bd8880223ad9e
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-09 16:20:44 +00:00
Automerger Merge Worker
a028215e7f Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp 2020-04-09 07:14:58 +00:00
Paul Hu
0082e52734 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I85efeb46d61dc130acc77ddc8cadba8014bb920b
2020-04-09 07:14:49 +00:00
Paul Hu
c171ef8ed3 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I18d2bd8063a82e1311248d88c08863beae4ca959
2020-04-09 07:14:35 +00:00
Paul Hu
ca9da38524 Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82
Change-Id: I96283fd4245fffa0b40c9f52cabeba7b5d48ea89
2020-04-09 06:58:04 +00:00
Paul Hu
f097d7e7c4 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I58431d6a0969b0de91e000578bd176caa6d19862
2020-04-09 06:57:53 +00:00
Paul Hu
fab349c0a9 Address aosp/1274403 leftover comment
Bug: 152828142
Test: atest EntitlementManagerTest

Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
Merged-In: I81f2d268c9f26bc4488b06032477a73d071f73f8
(cherry picked from commit 9fe0a868e909a4cd1c1c63bf981441f1b9128890)
2020-04-09 02:13:32 +00:00
Paul Hu
5bcdc0f947 [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours am: f0c477b54a -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ida906ffb11a704782a96dad6bd7f886a8b0c6571
2020-04-08 10:17:42 +00:00
Paul Hu
1a571fc91f [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ia7c07bfcedff2767e63a0bc15faaa3e8d237a9af
2020-04-08 10:17:35 +00:00
Paul Hu
231005897e Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457
Change-Id: Id9c327f22f44cfb908e70b3031fba7bd9381467b
2020-04-08 10:00:22 +00:00
Paul Hu
f0c477b54a [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: I8127f6ddc3f6eeca415cc168c2653b839f86d541
2020-04-08 10:00:16 +00:00
Automerger Merge Worker
b33911c19c Fix TetheringIntegrationTests failure
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
Merged-In: I5a537eca9b1aab3694a11a2dab147a31f289314c
(cherry picked from commit f626b8a5388746d163600a5eccb60e22cb1071bf)
2020-04-08 08:17:20 +00:00
Paul Hu
7e8f78291c Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d
Change-Id: I97924c2caf89eb6021e1b42c688c317a93b104fd
2020-04-08 08:12:25 +00:00
Paul Hu
77908d971d Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911
Change-Id: I420e4c0f9ae9f95dec822257c5dabf10f9b79201
2020-04-08 07:57:59 +00:00
Paul Hu
3d363f0911 Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9
Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7
2020-04-08 07:46:52 +00:00
Paul Hu
9f33a5a7d9 Merge "Address aosp/1274403 leftover comment" 2020-04-08 07:36:35 +00:00
Paul Hu
49d4e37c4f Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458
Change-Id: Ibd1f9252d27063f1640646ef453eb91132f53937
2020-04-08 06:40:40 +00:00
Paul Hu
c05defa458 Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb
Change-Id: Icde8ef078ec5ebde8d9c978432a9aa12b7a1e3a9
2020-04-08 06:40:20 +00:00
Paul Hu
525df29ccb Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef
Change-Id: If65885435886fab23f7948900127df09f08c15f4
2020-04-08 06:24:03 +00:00
Paul Hu
77f43e56ef Merge "Fix TetheringIntegrationTests failure" 2020-04-08 06:12:29 +00:00
Mark Chien
f3de7fc1e4 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: If4478d24c7b10a5de4e1dc7cbbe1ec7eeba1d75f
2020-04-08 06:06:34 +00:00
Mark Chien
4cea68cf9c Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f
Change-Id: I5334805bc74c20d986375fc5558f4cd5ada11ecf
2020-04-08 05:55:35 +00:00
Mark Chien
547dd723fa [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: I0eca1b568e41681cc0f361a972f529f6bb0fb738
2020-04-08 05:50:17 +00:00
Mark Chien
56f867cfd4 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: Ibfce142fdcf6c79a4220c241b63dadf147caf80c
2020-04-08 05:41:38 +00:00
paulhu
eaa2b0e30a Address aosp/1274403 leftover comment
Bug: 152828142
Test: atest EntitlementManagerTest

Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
2020-04-08 11:45:08 +08:00
paulhu
d584d2fa36 Fix TetheringIntegrationTests failure
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
2020-04-08 09:57:57 +08:00
Mark Chien
47c8b0f87e Add TetheringServiceTest unitest
Bug: 145490751
Test: atest TetheringTests

Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
Merged-In: I68cd403302848c041444e6d47652435d67f59273
(cherry picked from commit 790a4dd7d3aa813f15fe95c5bf3cef6dd734ce32)
2020-04-08 01:02:39 +00:00
Mark Chien
0a90c3b9b4 Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803
Change-Id: I86c09957155e04603dd5d23e95a571b4e53c8f37
2020-04-07 16:11:58 +00:00
Mark Chien
6ca4626803 Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9
Change-Id: Ib34e3b601e8f2bbb96c2a706d614696500cc18fc
2020-04-07 16:05:50 +00:00
Luke Huang
0a578f04e7 Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f
Change-Id: I438680171292b044d0509a09e65a2cf08d6b1dff
2020-04-07 16:00:48 +00:00
Mark Chien
7f8095b2d9 Merge "Add TetheringServiceTest unitest" am: 7e0920903b
Change-Id: Ibc3a9a68df3400017fd8fc24af53e9c01708b11b
2020-04-07 15:50:32 +00:00
Luke Huang
8518b55a0f Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9
Change-Id: Ie89032a792aa05c50530dcf4e67b96d0717c992c
2020-04-07 15:45:02 +00:00
Mark Chien
7e0920903b Merge "Add TetheringServiceTest unitest" 2020-04-07 15:39:38 +00:00
Luke Huang
f49e7dfca9 Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a
Change-Id: I4680ab48740223fe128261ffd122c771cee52e98
2020-04-07 15:33:04 +00:00
Luke Huang
6ca4ec97d2 Use the lastest frozen netd_aidl_interface in framework
Bug: 140541991
Test: build
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-07 08:35:42 +00:00
Mark Chien
e879e08ae0 [automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours am: 164ec44482 -s ours
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21 is in history

Change-Id: I88dc7a8eb8e72cd85e52980cf063968ae549dd4d
2020-04-07 08:11:02 +00:00
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
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