Commit Graph

580 Commits

Author SHA1 Message Date
Mark Chien
dd81ce4743 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Idfc7a32b608c97c9ebc956b6d4bf85a5d8f42776
2020-04-14 02:19:35 +00:00
Mark Chien
d5b1f4c10f Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9
Change-Id: I10166943f9c84abc71e34807fd6960c4fa23fed5
2020-04-14 01:58:11 +00:00
Mark Chien
313841e5eb Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c
Change-Id: Icc13f39dc779d7432d95c07aedbcf1bc5d756078
2020-04-14 01:50:18 +00:00
Ashwini Oruganti
910a0b44dd Tethering: Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit dc03d15189)
2020-04-14 00:08:24 +08:00
Ashwini Oruganti
af37b0a723 Tethering: Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit 9226d6c835cd57d10a7562f18143dbaae8601b43)
2020-04-13 15:15:28 +00:00
Mark Chien
e600d2685b [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I66e4ecbfff6afc191a053a4c8c4d3603af41d519
2020-04-10 13:46:38 +00:00
Treehugger Robot
5da1070d8f Assign specific client address to dhcp server
Bug: 141256482
Test: manual
      atest TetheringTests

Merged-In: Ief76c98c843ba5420224cbf0f34464f366c891b7
Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
2020-04-10 10:03:20 +00:00
Luke Huang
970a18a828 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: Ib1f389f3359d3be6d8660add26377a5a4e1906c2
2020-04-10 08:31:31 +00:00
Luke Huang
d20078112b Use the lastest frozen netd_aidl_interface in framework
Bug: 140541991
Test: build
Merged-In: I984969e09f8d5196945a7412c51bd8880223ad9e
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-09 16:20:44 +00:00
Paul Hu
f097d7e7c4 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I58431d6a0969b0de91e000578bd176caa6d19862
2020-04-09 06:57:53 +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
f0c477b54a [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: I8127f6ddc3f6eeca415cc168c2653b839f86d541
2020-04-08 10:00:16 +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
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
3d363f0911 Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9
Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7
2020-04-08 07:46:52 +00:00
Paul Hu
9f33a5a7d9 Merge "Address aosp/1274403 leftover comment" 2020-04-08 07:36:35 +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
525df29ccb Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef
Change-Id: If65885435886fab23f7948900127df09f08c15f4
2020-04-08 06:24:03 +00:00
Paul Hu
77f43e56ef Merge "Fix TetheringIntegrationTests failure" 2020-04-08 06:12:29 +00:00
Mark Chien
56f867cfd4 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: Ibfce142fdcf6c79a4220c241b63dadf147caf80c
2020-04-08 05:41:38 +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
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
6ca4626803 Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9
Change-Id: Ib34e3b601e8f2bbb96c2a706d614696500cc18fc
2020-04-07 16:05:50 +00:00
Mark Chien
7f8095b2d9 Merge "Add TetheringServiceTest unitest" am: 7e0920903b
Change-Id: Ibc3a9a68df3400017fd8fc24af53e9c01708b11b
2020-04-07 15:50:32 +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
f49e7dfca9 Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a
Change-Id: I4680ab48740223fe128261ffd122c771cee52e98
2020-04-07 15:33:04 +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
164ec44482 [automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21 is in history

Change-Id: Iecc2dfebddec5cf1e6e79ea0bdeffba386462cfd
2020-04-07 07:59:18 +00:00
Mark Chien
8caf921dc8 Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev 2020-04-07 07:50:40 +00:00
Paul Hu
102d1715d0 [automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 -s ours
am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 4175676eab is in history

Change-Id: I5f0b11ed607b77658c34f774cbe96d1e45fdeaad
2020-04-07 04:49:33 +00:00
Lorenzo Colitti
19d7f88707 [automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 6343b0c968 -s ours
am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 cfd82d4361 is in history

Change-Id: I62b9ee8fbf3bce45c349ca23cc056c9d86466a4e
2020-04-07 04:49:14 +00:00
Lorenzo Colitti
136a64f089 [automerger skipped] Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf -s ours
am skip reason: Change-Id Ia73ba8a121a3744a5e36795d2d2bff2f099c1394 with SHA-1 0a61e95319 is in history

Change-Id: I70e18ba92ea1ac35b678dbee6d8a44cfce493f79
2020-04-07 04:48:22 +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
389cfdc8e1 [automerger skipped] Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: 210adac5fa -s ours
am skip reason: Change-Id I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38 with SHA-1 49889dd4c0 is in history

Change-Id: Ifdedc3ae90e7bf4aeb9970cdd4b04cecdf625e19
2020-04-07 03:16:25 +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
fd997f3c45 [automerger skipped] Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 -s ours
am skip reason: Change-Id I83718c80ef9d31199c87021b4dd5821717fd5ba5 with SHA-1 beb28405b1 is in history

Change-Id: I11f1e9b9df4e7c2111b6d9f0e5b6c25ec0150e69
2020-04-07 02:15:27 +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
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
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
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