Commit Graph

533 Commits

Author SHA1 Message Date
Mark Chien
258d28303e Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8
Change-Id: I5b38a893522fcea37f757c7d7234d07e3176fe1b
2020-04-06 15:59:56 +00:00
Mark Chien
173e69b2a8 Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444
Change-Id: I27ce7e0fd3f061349838ef6206c8d77eb2231498
2020-04-06 15:48:56 +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
d0b65f11be Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18
Change-Id: I735c1c19a6255bdfd0fa09050dbb403fd9e43c7a
2020-04-06 11:02:14 +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
Lorenzo Colitti
2aea86b521 Merge "Migrate to TetherOffloadRuleParcel in IpServer" am: b22a70d7c8
Change-Id: I5c24c4f7cfd05eb037e33d0bc04da653f235ba0f
2020-04-06 09:03:26 +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
7f05bb9b2d Merge "Fix EntitlementManager issues" am: 943af02d92
Change-Id: I557ef0b3278aa72e34a2290c49dc3c8b82bceaf9
2020-04-06 07:56:26 +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
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
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
b3c0b9205f Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e
Change-Id: I592468bf53ff925ec4ee8a04fee20404594237fe
2020-04-03 08:31:39 +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
8a30564015 [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ib24fee25c1aedfe1a18d039141be032b4503c9f0
2020-04-01 04:07:46 +00:00
Lorenzo Colitti
57827f67e0 Merge "Add an Ethernet tethering test." into rvc-dev 2020-04-01 03:56:28 +00:00
Anton Hansson
c866875727 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: If0728ff3de015e338161f538dc3aea83808952ba
2020-03-31 12:12:23 +00:00
Anton Hansson
edd558b244 Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae
Change-Id: Ib9e7dd7756dd4b6cf3f72c009a26075b3132e6be
2020-03-31 11:55:37 +00:00
Anton Hansson
f7a2a2d4ae Merge "Feed framework-tethering-stubs the src filegroup" 2020-03-31 11:39:40 +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
dae9d36d40 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ib1172487afd1fdfea82b83099ebfc60101afc6c0
2020-03-30 15:10:56 +00:00
Anton Hansson
82b68376aa [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: I1f1e4179236397649989ed7bff24d99ed5bada6b
2020-03-30 15:10:31 +00:00
Anton Hansson
1de34ce81b Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50
Change-Id: I148fcec861b97fbead0884918bff4e1560fab23d
2020-03-30 14:47:33 +00:00
Anton Hansson
fdcab3c71c Merge "Build tethering against the module SDK" am: 6abf8e41f7
Change-Id: If720371eac2acc92677a15f7c0c5ae55c84023a6
2020-03-30 14:47:06 +00: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
Treehugger Robot
815ab636c3 Merge "Assign specific client address to dhcp server" am: 037becbf64
Change-Id: Ic5b645bb62a1b62ab010a9fa50427e1a1fc8ff01
2020-03-30 04:06:29 +00:00
Remi NGUYEN VAN
f3d6eb3da9 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +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
2692eab096 Merge "Create a builder for NetworkCapabilities." am: b3289466c5
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
b3289466c5 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Lorenzo Colitti
9cc9f6b471 Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7
Change-Id: Ia6595e18ac62862f8458efb0fc4523f64795d9ca
2020-03-30 02:50:18 +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
ebb649bf5a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev 2020-03-27 23:05:45 +00:00
Mark Chien
210e839e29 [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: Ibafc5531c4073fe2d9ace03bb14c2c045ff204c9
2020-03-27 16:17:21 +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
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
17ce0f6aa1 Merge "Add an Ethernet tethering test." am: cdd0dabe09
Change-Id: Id3ba255901ad7861b10c3d28fc776e74fb642843
2020-03-27 10:51:57 +00:00