Commit Graph

481 Commits

Author SHA1 Message Date
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
Vladimir Marko
577707e09b Add permitted_packages to framework-tethering.
Test: m out/soong/.intermediates/frameworks/base/packages/Tethering/common/TetheringLib/framework-tethering/android_common/package-check.stamp
Bug: 151314205
Change-Id: I248c36b2cf2f5776978c4fd2322d3b73ade309ff
2020-03-25 11:19:36 +00:00
Treehugger Robot
7928cc4f5d [automerger skipped] Merge "Hide startTethering with type function to module-lib only" am: 2fdbdafbdb am: 641c74bccd -s ours
am skip reason: Change-Id Icef8b363aae97dd020d618bcb397f661aa6c4750 with SHA-1 b1bfea5367 is in history

Change-Id: I60992c0b5601970c2dc423ff3e96d5ab2efc1171
2020-03-25 09:21:14 +00:00
Treehugger Robot
641c74bccd Merge "Hide startTethering with type function to module-lib only" am: 2fdbdafbdb
Change-Id: I1b7ee6b39395b15042788125cbc71a65edad6c87
2020-03-25 09:10:08 +00:00
Treehugger Robot
2fdbdafbdb Merge "Hide startTethering with type function to module-lib only" 2020-03-25 08:53:02 +00:00
markchien
1d0aebc713 Hide startTethering with type function to module-lib only
Bug: 151918384
Test: m
Change-Id: Icef8b363aae97dd020d618bcb397f661aa6c4750
Merged-In: Icef8b363aae97dd020d618bcb397f661aa6c4750
2020-03-25 08:07:01 +00:00
Paul Hu
ff89f2fd43 Merge "[TNU03] Add TetheringNotificationUpdaterTest" am: 18c34694f9 am: 493d3a833c
Change-Id: I1085dceb190b32122416d0240275d7ecb81aa627
2020-03-25 07:15:31 +00:00
Paul Hu
493d3a833c Merge "[TNU03] Add TetheringNotificationUpdaterTest" am: 18c34694f9
Change-Id: I7f046a9fa8d58f7b37a66dd5834f69d8acd468d5
2020-03-25 07:02:16 +00:00
Paul Hu
18c34694f9 Merge "[TNU03] Add TetheringNotificationUpdaterTest" 2020-03-25 06:45:14 +00:00
Paul Hu
357c0fcf14 Merge "[TNU02] Update tethering notification by active data subid" am: 8a47935fca am: 7135a19540
Change-Id: I2e1555972d9217fa689b10b23525fa5ba12c373b
2020-03-25 05:37:05 +00:00
Paul Hu
7135a19540 Merge "[TNU02] Update tethering notification by active data subid" am: 8a47935fca
Change-Id: I6ce7d318c14343ad32571ee86e1b575fd1395603
2020-03-25 05:14:58 +00:00
Paul Hu
8a47935fca Merge "[TNU02] Update tethering notification by active data subid" 2020-03-25 04:53:32 +00:00
Chalard Jean
744cf62d3f [automerger skipped] Merge "Expose netId by adding getter API" am: dd9c1f56fc am: 63a9f58437 -s ours
am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 dc651f03da is in history

Change-Id: Idc9f5dc82a1a155b136d07721400eeabd005832d
2020-03-25 02:59:26 +00:00
Chalard Jean
63a9f58437 Merge "Expose netId by adding getter API" am: dd9c1f56fc
Change-Id: Iab3bae76255fb4096aa3b2c9da8d6f12bb588d3e
2020-03-25 02:44:04 +00:00
Chalard Jean
dd9c1f56fc Merge "Expose netId by adding getter API" 2020-03-25 02:23:03 +00:00