Commit Graph

467 Commits

Author SHA1 Message Date
Paul Hu
bb1f4a6f2b Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c am: aa4e34d823
Change-Id: I07dd1b7ef7f52c57a7d5020e4d274950923a50fb
2020-04-08 08:51:23 +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
9f33a5a7d9 Merge "Address aosp/1274403 leftover comment" 2020-04-08 07:36:35 +00:00
Automerger Merge Worker
2a07469306 Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d am: e271f0784f
Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
2020-04-08 07:13:44 +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
77f43e56ef Merge "Fix TetheringIntegrationTests failure" 2020-04-08 06:12:29 +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
fbe8a3d909 Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803 am: 0a90c3b9b4 am: 1a69dade06
Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
2020-04-07 16:17:49 +00:00
Luke Huang
02ab8737d0 Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f am: 0a578f04e7 am: 906b906af6
Change-Id: If70288416cd1d6ec7a0d344ac7ab619fd290e2fc
2020-04-07 16:15:21 +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
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
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
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
258d28303e Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8
Change-Id: I5b38a893522fcea37f757c7d7234d07e3176fe1b
2020-04-06 15:59:56 +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
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
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
Lorenzo Colitti
dc25174ebe Merge "Migrate to TetherOffloadRuleParcel in IpServer" am: b22a70d7c8 am: 2aea86b521
Change-Id: I8257dacfb734e03b52d447a0b658ce372eb46fb0
2020-04-06 09:19:57 +00:00
Paul Hu
0c149ed3e6 Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d am: 784b7a6925 am: fbc0efb4f1 am: 7975177e5f
Change-Id: Ia353f570bc9706b1d1ae1eeb3684cf64a686ff15
2020-04-06 08:52:54 +00:00
Lorenzo Colitti
b22a70d7c8 Merge "Migrate to TetherOffloadRuleParcel in IpServer" 2020-04-06 08:40:51 +00:00
Paul Hu
784b7a6925 Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d
Change-Id: I0fef76b2fa00757afc1db9a073ad9e912ca98b19
2020-04-06 08:33:31 +00:00
Paul Hu
943af02d92 Merge "Fix EntitlementManager issues" 2020-04-06 07:33:26 +00:00
Xiao Ma
49889dd4c0 Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.
Bug: 130741856
Test: atest TetheringTests
Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
2020-04-06 15:59:22 +09:00
markchien
e96f42d27b Add TetheringServiceTest unitest
Bug: 145490751
Test: atest TetheringTests
Change-Id: I68cd403302848c041444e6d47652435d67f59273
2020-04-06 12:02:17 +08:00
Jooyung Han
29558d9ac7 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: 3c6dfcf00d am: ff15621dd9
Change-Id: Id5c8a671a2053f706dd8c149799b959fb3e3d388
2020-04-05 01:41:26 +00:00
Jooyung Han
3c6dfcf00d Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e
Change-Id: I1d48c1fd48d6c0771ee73e8dcf216e52524319b4
2020-04-05 01:02:18 +00:00
Jooyung Han
ae70a497c5 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c
Change-Id: I3d029c8aa9fd4fdea6589cb5d69e94803b9a78c6
2020-04-05 00:32:30 +00:00
Lorenzo Colitti
beb28405b1 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
Change-Id: I83718c80ef9d31199c87021b4dd5821717fd5ba5
2020-04-04 16:24:58 +09:00
Lorenzo Colitti
be230bf9f7 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db am: 24a3188dd7 am: 674256af64
Change-Id: I5375da5a15dfd050754beb1573c69c89983a2aa8
2020-04-03 09:44:27 +00:00
Lorenzo Colitti
d233c3c1db Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f
Change-Id: I211d8e6a19d56d79afe3ad894b8398f4c36d0e9f
2020-04-03 08:41:51 +00:00
Lorenzo Colitti
cfd82d4361 Add a test for static IPv4 address tethering configuration.
Bug: 150644681
Test: test-only change
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
2020-04-03 10:47:47 +09:00
Jooyung Han
f1460fad52 Add min_sdk_version:R to updatable apexes
APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).

Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: I4a893c34b09334eea124266287301e479b9e8a59
2020-04-02 13:54:06 +00:00
Lorenzo Colitti
57827f67e0 Merge "Add an Ethernet tethering test." into rvc-dev 2020-04-01 03:56:28 +00:00
Treehugger Robot
196a5ff482 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60 am: d93de672d1 am: 7f34b15526
Change-Id: I0d0ae21e4784f7320d7785763ed0a1079e2271e4
2020-03-31 18:37:00 +00:00
Android Build Merger (Role)
63aa6173b0 Merge "Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471 am: f27f2ae4bb" into rvc-d1-dev-plus-aosp am: 1b64249120 am: cbe03df318
Change-Id: If93377b5832751d3d3a20f0af66bffeaecb3187b
2020-03-31 18:07:47 +00:00
paulhu
4175676eab Fix EntitlementManager issues
1. Add TETHERING_ETHERNET to vaild downstream type. So starting
   ethernet tethering will do entitlement check as well.
2. Ignore request with invalid downstream type on
   handleRequestLatestTetheringEntitlementValue()

Bug: 152828758
Bug: 152828142
Test: atests TetheringTests CtsTetheringTest

Change-Id: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
2020-03-31 18:01:54 +08:00
Anton Hansson
cdc8658403 Feed framework-tethering-stubs the src filegroup
This filegroups strips the "src" prefix away from the src path
for the filter_packages check in droiddoc.

Bug: 149293194
Test: m update-api (no change)
Change-Id: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
Merged-In: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
2020-03-31 09:56:55 +01:00
Anton Hansson
fb38e85a50 Merge "Make framework-tethering stubs use the new defaults" 2020-03-30 14:16:02 +00:00
Anton Hansson
6abf8e41f7 Merge "Build tethering against the module SDK" 2020-03-30 14:15:42 +00:00
Treehugger Robot
a3fbca5f60 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3
Change-Id: Ia0e4a913faa5eac5d5ccba837eb7774d59670d27
2020-03-30 04:23:55 +00:00
Lorenzo Colitti
f27f2ae4bb Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471
Change-Id: I1967dcb1a51cedb110a47ed5ad14e4e71f95adf3
2020-03-30 03:38:51 +00:00
Treehugger Robot
037becbf64 Merge "Assign specific client address to dhcp server" 2020-03-30 03:38:46 +00:00
Remi NGUYEN VAN
b3289466c5 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
TreeHugger Robot
d30aeb02aa Merge "Import translations. DO NOT MERGE" 2020-03-28 19:12:43 +00:00
Bill Yi
a81c274f04 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Idaf80948b14cb5a1269f2aaaafec4aa1e500894b
2020-03-28 05:23:44 -07:00