Commit Graph

455 Commits

Author SHA1 Message Date
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
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
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
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
Automerger Merge Worker
5d36cce0e4 Merge "Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: e9fc36951a am: d0f5e18d9f" into rvc-qpr-dev-plus-aosp am: db84d00f21
Change-Id: I750c2364276200ba75ac2661289dcd8e59e74e61
2020-03-27 23:44:57 +00:00
Anton Hansson
969eb5984d Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a
Change-Id: I2719c6447a151afdba27af18027273a3221bd40b
2020-03-27 23:10:03 +00:00
Anton Hansson
d0f5e18d9f Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: e9fc36951a
Change-Id: I4abcb4f3eef5e5cf2c0499e1200f60f6480c6f53
2020-03-27 23:09:46 +00:00
Anton Hansson
ebb649bf5a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev 2020-03-27 23:05:45 +00:00
Lorenzo Colitti
0a61e95319 Use CompletableFuture instead of a latch.
Addresses review comments on aosp/1260100.

Bug: 150644681
Test: test-only change
Change-Id: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
2020-03-27 23:51:48 +09:00
Mark Chien
6d4001132d Register callback and receiver after tethering is created
Tethering service is created after boot complete which means most of
the services are ready before tethering. Once tethering register the
callback, callback event may come-in immediately. Make sure all of
tethering related object is created, then register the callback,
receiver, or listener.

Bug: 149965121
Test: atest TetheringTests
      manual on/off tethering

Change-Id: Ifdc427341db7d1313ad4b61207a96ab379d100aa
Merged-In: I3941a186770679e7b476073d774e2310e25e44c6
(cherry picked from commit 285be1ee938ddc9728ccc3e951ed0ed1b2fa7117)
2020-03-27 14:01:49 +00:00
Anton Hansson
90ae90b6e0 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
2020-03-27 13:46:11 +00:00
Lorenzo Colitti
ebbb3734d5 Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1 am: c0380a4e8b am: 72340576f8 am: 599a7eb5c2
Change-Id: I2b262fe9b1739e61f2590788a964402f0f5d9311
2020-03-27 11:50:12 +00:00
Lorenzo Colitti
eb73310727 Add an Ethernet tethering test.
This test uses EthernetManager's ability to use test network
interfaces to test tethering. This provides a fairly realistic
integration test for Tethering and its callbacks, IpServer and
DhcpServer, and so on.

It is in a new integration/ directory under Tethering because I
didn't really know where to put it. It's fast enough to run in
presubmit, but it didn't seem to be appropriate to call it a
unit test, and in the future we could also use this test to do
some limited testing of real Ethernet tethering as well.

Bug: 150644681
Test: atest TetheringIntegrationTests:EthernetTetheringTest --rerun-until-failure 100
Merged-In: Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4
Change-Id: Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4
2020-03-27 11:39:50 +00:00
Lorenzo Colitti
c0380a4e8b Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1
Change-Id: I027ccf1dd0cca05432994ea08dde55f94d3c2616
2020-03-27 11:07:01 +00:00
Lorenzo Colitti
cdd0dabe09 Merge "Add an Ethernet tethering test." 2020-03-27 10:37:18 +00:00
Mark Chien
148c403637 Merge "Register callback and receiver after tethering is created" am: 33788bcaac am: 01326a25c0 am: bfe7965e6b am: d41831013e am: d0938cd38d
Change-Id: Ifdc427341db7d1313ad4b61207a96ab379d100aa
2020-03-27 09:37:01 +00:00