Commit Graph

497 Commits

Author SHA1 Message Date
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
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
Lorenzo Colitti
cdd0dabe09 Merge "Add an Ethernet tethering test." 2020-03-27 10:37:18 +00:00
Mark Chien
bfe7965e6b Merge "Register callback and receiver after tethering is created" am: 33788bcaac am: 01326a25c0
Change-Id: Ifc4846347326ce5e18a2f8f1ac060febc0cbd486
2020-03-27 08:55:32 +00:00
Mark Chien
01326a25c0 Merge "Register callback and receiver after tethering is created" am: 33788bcaac
Change-Id: I9f20ea544619bc018af362ff8aa3dd9c7871ba15
2020-03-27 08:43:06 +00:00
Mark Chien
33788bcaac Merge "Register callback and receiver after tethering is created" 2020-03-27 08:31:11 +00:00
Lorenzo Colitti
4896e3200f 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
Change-Id: Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4
2020-03-27 17:16:30 +09:00
markchien
e31fb9d7bd 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: I3941a186770679e7b476073d774e2310e25e44c6
2020-03-27 08:13:28 +00:00
Anton Hansson
bc784d08fe Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: 49c50fb36b
Change-Id: I945ed8b1bd0c38423967c17d7c362a7aab4813a4
2020-03-26 08:54:19 +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
9df51b1417 [automerger skipped] Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab -s ours
am skip reason: Change-Id I6b34ea747ae1831001077f44879bb6828dcecc96 with SHA-1 ca071b79cd is in history

Change-Id: If5a004eb8085f881683ecc0513234670ab2d56c2
2020-03-26 07:15:34 +00:00
TreeHugger Robot
cb5bd5fa55 [automerger skipped] Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e -s ours
am skip reason: Change-Id I68123e6dd04ccae5da2ecd7526c11d9f835d1d57 with SHA-1 6976fae02e is in history

Change-Id: I33e7e6f9654f5221f937a1968b902c85f5cf9914
2020-03-26 07:15:04 +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
bd39aeaa53 [automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 -s ours
am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 972f031fa5 is in history

Change-Id: Id204d754e09b8afa917e4fe03f0b9abf52d96b38
2020-03-26 04:59:06 +00:00
Paul Hu
9e62cb2738 [automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 769e00cad2 is in history

Change-Id: Idc32fe8327394d01b29f1e6ef6c45acfa0f4778e
2020-03-26 04:58:34 +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
5fc12a262c [automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 -s ours
am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 7bfbe253d7 is in history

Change-Id: I2e1d84101acf876b9a6754c576625bcd369b96eb
2020-03-26 02:31:01 +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
Paul Hu
71007d31b5 [TNU03] Add TetheringNotificationUpdaterTest
Add new test for TetheringNotificationUpdater

Bug: 122085773
Bug: 130596698
Test: atest TetheringTests
Change-Id: I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15
Merged-In: I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15
(cherry picked from aosp/1209985)
2020-03-26 01:59:15 +00:00
Vladimir Marko
1d0fb22ef1 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 3ef31a3ccd am: 26bff21f5e -s ours
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 577707e09b is in history

Change-Id: Ib63bf9c7be1419b8f9b5bd6a2230733480786266
2020-03-25 17:48:18 +00:00
Vladimir Marko
26bff21f5e Merge "Add permitted_packages to framework-tethering." am: 3ef31a3ccd
Change-Id: If6038fd99d049bbeb752fa39cda36b6908a4a214
2020-03-25 17:26:24 +00:00
Vladimir Marko
3ef31a3ccd Merge "Add permitted_packages to framework-tethering." 2020-03-25 17:09:24 +00:00
Treehugger Robot
b989c19abf Merge "Update connected clients when a downstream disappears." am: 22e8c3350b am: bd69be52b1
Change-Id: I542acb7f50b1891b89f5fe495c3f58456dbd8d91
2020-03-25 15:32:41 +00:00
Treehugger Robot
bd69be52b1 Merge "Update connected clients when a downstream disappears." am: 22e8c3350b
Change-Id: I843d779e447f05611f1dd0d8cb57e016398f0f67
2020-03-25 15:19:55 +00:00
Treehugger Robot
22e8c3350b Merge "Update connected clients when a downstream disappears." 2020-03-25 15:00:43 +00:00
Vladimir Marko
eae43d4fcc Add permitted_packages to framework-tethering.
(cherry picked from commit 577707e09b)

Test: m out/soong/.intermediates/frameworks/base/packages/Tethering/common/TetheringLib/framework-tethering/android_common/package-check.stamp
Bug: 151314205
Merged-In: I248c36b2cf2f5776978c4fd2322d3b73ade309ff
Change-Id: Iddeeb6648f1ed2a31eebf04eb465ea675fb610ae
2020-03-25 14:04:00 +00:00
Vladimir Marko
30f004353b Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0
Change-Id: Iada058c91acebc7ae95cb7cb8fae4584be37ab3a
2020-03-25 13:53:19 +00:00
Vladimir Marko
b9492b7be0 Merge "Add permitted_packages to framework-tethering." into rvc-dev 2020-03-25 13:50:51 +00:00
Paul Hu
e4beb93149 [TNU02] Update tethering notification by active data subid
Tethering notification can be customized by different subid. Thus
update notification when active data subid changed.

Bug: 122085773
Bug: 130596698
Test: atest TetheringTests
Change-Id: I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2
Merged-In: I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2
(cherry picked from aosp/1209984)
2020-03-25 13:47:48 +00:00
Lorenzo Colitti
ca071b79cd 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
2020-03-25 22:14:46 +09:00
Paul Hu
5ea31650ae Merge "[TNU04] Add tethering restricted notification" am: 255565e839 am: 7696642a8c
Change-Id: Iad59bdf6b3c5b3ce059d7c01c7396866aab85767
2020-03-25 12:03:10 +00:00
Paul Hu
7696642a8c Merge "[TNU04] Add tethering restricted notification" am: 255565e839
Change-Id: I6276b1a2d55c536bf7b9f03407c967636b521870
2020-03-25 11:45:06 +00:00
Paul Hu
255565e839 Merge "[TNU04] Add tethering restricted notification" 2020-03-25 11:30:41 +00:00