Commit Graph

354 Commits

Author SHA1 Message Date
Mark Chien
2e394fd361 Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb am: d6e02a62d6
Change-Id: I97811d4d8f101098207a79e75684f59b2bd60d19
2020-04-07 08:23:36 +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
8caf921dc8 Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev 2020-04-07 07:50:40 +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
f4ba82a587 Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165
Change-Id: I4604c7e324757e738fdaec2d2d9f0b351086a7e1
2020-04-07 04:49:37 +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
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
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
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
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
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
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
Paul Hu
bd8d7a8208 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
Merged-In: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
(cherry picked from commit c502e050fd9543e8bde45014dd66ea1be91c90ef)
2020-04-07 01:23:49 +00:00
Lorenzo Colitti
e6107d2466 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
Merged-In: I83718c80ef9d31199c87021b4dd5821717fd5ba5
Change-Id: I83718c80ef9d31199c87021b4dd5821717fd5ba5
2020-04-06 15:45:58 +00:00
Jooyung Han
a4686e8086 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: c3c4e49702
Change-Id: I6875a6832a84ab19fc805589c8552cf91a8cd0b7
2020-04-05 01:20:13 +00:00
Jooyung Han
39d545982e Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c
Change-Id: I531247560c84d3cc49459d340f6c2d6cf6b31141
2020-04-05 00:32:14 +00: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
9f1af1dbc1 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e
Change-Id: Iea225dfd81eb2b146a679b1f40999c86fbb3fe9a
2020-04-01 04:34:30 +00:00
Lorenzo Colitti
b326d28ff9 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0
Change-Id: I6be7379914fcaade0177d661d5e80ba5031b50d7
2020-04-01 04:08:00 +00:00
Lorenzo Colitti
57827f67e0 Merge "Add an Ethernet tethering test." into rvc-dev 2020-04-01 03:56:28 +00:00
TreeHugger Robot
2a0a236ed0 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-03-28 18:08:07 +00:00
Bill Yi
49ea07f087 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4bedd02ee1c673d604782844f69ee2803f61729c
2020-03-28 07:21:37 -07:00
Anton Hansson
e9fc36951a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a
Change-Id: Ic124bdca285f0e952ed65214eaa3cc0778a142d4
2020-03-27 23:08:37 +00:00
Anton Hansson
ebb649bf5a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev 2020-03-27 23:05:45 +00:00
Mark Chien
30f73bae19 Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe
Change-Id: I311e5db2aacde60b4eb3cb893a9234e9501e5f36
2020-03-27 16:13:10 +00: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
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
Anton Hansson
23c26c7a77 Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: 49c50fb36b
Change-Id: I2e135e5df483b3a7583dcf0e73cfe085e9953314
2020-03-26 08:53:51 +00:00
Anton Hansson
49c50fb36b Merge "Make framework-tethering stubs use the new defaults" into rvc-dev 2020-03-26 08:39:02 +00:00
TreeHugger Robot
06cc01c907 Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab
Change-Id: I39fb85e83dcbc82f421b3bd35af78bf8afc12603
2020-03-26 07:15:56 +00:00
TreeHugger Robot
28e7899139 Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e
Change-Id: If94b2b9a8e816e20ca6c45b2a4e4c4cdf3b2448a
2020-03-26 07:15:13 +00:00
Treehugger Robot
a4e2383d84 Update connected clients when a downstream disappears.
Otherwise, if another downstream of the same type reappears, the
code would fire a callback with the previous list of clients.

Bug: 150644681
Test: atest TetheringIntegrationTests:EthernetTetheringTest --rerun-until-failure 100
Change-Id: I6b34ea747ae1831001077f44879bb6828dcecc96
Merged-In: I6b34ea747ae1831001077f44879bb6828dcecc96
(cherry picked from commit 3984360f642ddd5820ced5a6935e37a8ae0d9d76)
2020-03-26 05:07:06 +00:00
Treehugger Robot
595266e4a8 Add a log message if enabling Ethernet tethering if it is already enabled.
Test: builds
Bug: 150644681
Change-Id: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
Merged-In: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
(cherry picked from commit e6b8ded8121c137a7e434e1c2a9e04cc144f2f28)
2020-03-26 05:05:35 +00:00
Paul Hu
7f416f2841 Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402
Change-Id: Ie258a04699021a2b0891628f172e838faca3d4bc
2020-03-26 04:59:26 +00:00
Paul Hu
477873b6a3 Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2
Change-Id: If2751e193906169f3b5cbbedefeef91072bd61b7
2020-03-26 04:58:33 +00:00
Paul Hu
3d9c05e402 Merge "[TNU04] Add tethering restricted notification" into rvc-dev 2020-03-26 04:40:55 +00:00
Paul Hu
4472b04bd2 Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev 2020-03-26 04:40:36 +00:00
Paul Hu
4f4044ad2e Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65
Change-Id: I0d8631a29c89802acbdbeeb7b603512735bd55c7
2020-03-26 02:31:45 +00:00
Paul Hu
cf2a026a65 Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev 2020-03-26 02:28:48 +00:00
Paul Hu
fe6c41c815 [TNU04] Add tethering restricted notification
If tethering is restricted to the user, show restricted
notification to notify the user.

Bug: 122085773
Test: atest TetheringTests
Change-Id: Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7
Merged-In: Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7
(cherry picked from aosp/1188867)
2020-03-26 02:01:37 +00:00