Commit Graph

593 Commits

Author SHA1 Message Date
Anton Hansson
f82e18dc8d Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: 49c50fb36b am: bc784d08fe
Change-Id: I2d1b88e5965848bfaf1f7e7d6008e6640a246176
2020-03-26 09:06:02 +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
165e46f815 [automerger skipped] Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab -s ours am: 9df51b1417 -s ours
am skip reason: Change-Id I6b34ea747ae1831001077f44879bb6828dcecc96 with SHA-1 a4e2383d84 is in history

Change-Id: I1ab15a4944970c84f52ed5a74c1160e13f6eb40e
2020-03-26 07:32:49 +00:00
Automerger Merge Worker
20df4cd560 Merge "[automerger skipped] Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e -s ours am: cb5bd5fa55 -s ours" into rvc-d1-dev-plus-aosp 2020-03-26 07:32:46 +00:00
TreeHugger Robot
cea7d4e8a7 [automerger skipped] Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e -s ours am: cb5bd5fa55 -s ours
am skip reason: Change-Id I68123e6dd04ccae5da2ecd7526c11d9f835d1d57 with SHA-1 6976fae02e is in history

Change-Id: Iabf31ee17f99555981adb1df8f1738178c40953f
2020-03-26 07:32:39 +00:00
TreeHugger Robot
3fa4aa2ba1 [automerger skipped] Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab am: 06cc01c907 -s ours
am skip reason: Change-Id I6b34ea747ae1831001077f44879bb6828dcecc96 with SHA-1 ca071b79cd is in history

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

Change-Id: I85dd7e7363f19ffc4f1c7e081d305a8dfc74537c
2020-03-26 07:32:15 +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
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
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
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
Paul Hu
8077e1513e [automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 am: 7f416f2841 -s ours
am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 fe6c41c815 is in history

Change-Id: I6150c842665721f0e4516de700caa52664446172
2020-03-26 05:22:12 +00:00
Paul Hu
28e30a1f1d [automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 -s ours am: bd39aeaa53 -s ours
am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 972f031fa5 is in history

Change-Id: If6f6a9ae9be227ae1a081f659332ffc659ab70d2
2020-03-26 05:21:54 +00:00
Automerger Merge Worker
2a143525fc Merge "[automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 am: 477873b6a3 -s ours" into rvc-d1-dev-plus-aosp 2020-03-26 05:21:34 +00:00
Paul Hu
3d01b0ec5f [automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 -s ours am: 9e62cb2738 -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 769e00cad2 is in history

Change-Id: I0865036d1e5892da759b0bfc16aac0970567825e
2020-03-26 05:21:30 +00:00
Paul Hu
380aac932d [automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 am: 477873b6a3 -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 769e00cad2 is in history

Change-Id: I221ed29f58cb2bb84b76d83a366edd525943b479
2020-03-26 05:21:25 +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
7f416f2841 Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402
Change-Id: Ie258a04699021a2b0891628f172e838faca3d4bc
2020-03-26 04:59:26 +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
477873b6a3 Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2
Change-Id: If2751e193906169f3b5cbbedefeef91072bd61b7
2020-03-26 04:58:33 +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
6137aa0c1b [automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 -s ours am: 5fc12a262c -s ours
am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 e4beb93149 is in history

Change-Id: Ie01eefa45bc2a19660aa4c3cdc137293508e3476
2020-03-26 02:53:14 +00:00
Paul Hu
bb20e9d27b [automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 am: 4f4044ad2e -s ours
am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 7bfbe253d7 is in history

Change-Id: Ie34a56723184d0a7311f96b3c2c0922a2e33918f
2020-03-26 02:53:01 +00:00
Paul Hu
4f4044ad2e Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65
Change-Id: I0d8631a29c89802acbdbeeb7b603512735bd55c7
2020-03-26 02:31:45 +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
3ec6219ec4 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 3ef31a3ccd am: 26bff21f5e -s ours am: 1d0fb22ef1 -s ours
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 577707e09b is in history

Change-Id: Id4e3a2c46530170bb32b199191a58fbef6bcc537
2020-03-25 17:48:51 +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
5572992eff Merge "Update connected clients when a downstream disappears." am: 22e8c3350b am: bd69be52b1 am: b989c19abf
Change-Id: I8d1c881e400e31ac7917978143771bf1dd1d17a8
2020-03-25 15:51:47 +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
3b71c4ee72 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: 30f004353b
Change-Id: I4a56112bc5342ae38067d95d791c673eab7608e9
2020-03-25 13:56:36 +00:00
Vladimir Marko
4690e54db2 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: a9be265783
Change-Id: I4389675d6e1232ccfd97cce1ce9d53e79bb59f44
2020-03-25 13:53:40 +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
a9be265783 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0
Change-Id: I75d151de8d3c0e35ef27958b6fabf7903d0dcc69
2020-03-25 13:52:51 +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
94ed5cee94 Merge "[TNU04] Add tethering restricted notification" am: 255565e839 am: 7696642a8c am: 5ea31650ae
Change-Id: I20dea62f405016a907a708b51f7556b94b960368
2020-03-25 12:12:05 +00: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