Paul Hu
cc8ffc96c0
Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5
...
Change-Id: I56ac87b28c26d178adaebb60457a4d3359a8d27a
2020-04-09 07:34:01 +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
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
65e78f0ccf
Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf
...
Change-Id: I3320229b0db242499041df6dc1e176f2efb8929a
2020-04-08 10:35:57 +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
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
Mark Chien
e8809b74b1
Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90
...
Change-Id: I58ff75339f93ca53c1c39eca1eb65a2da6b5ff97
2020-04-08 06:12:01 +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
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
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