Commit Graph

794 Commits

Author SHA1 Message Date
Paul Hu
6baf19213d [automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 am: 7f416f2841 -s ours am: 8077e1513e -s ours am: f28bba2033 -s ours
am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 fe6c41c815 is in history

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

Change-Id: Ic59c3b26329518ec0834da3865a7a6dc5e465c8b
2020-03-26 05:52:21 +00:00
Automerger Merge Worker
b58dfa1acc Merge "[automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 am: 477873b6a3 -s ours" into rvc-d1-dev-plus-aosp am: 2a143525fc -s ours am: 1686ca92e9 -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 71007d31b5 is in history

Change-Id: Id17a98af333ea2dba763b051adde4e3f8e5f508b
2020-03-26 05:51:54 +00:00
Paul Hu
b85e38468c [automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 -s ours am: 9e62cb2738 -s ours am: 3d01b0ec5f -s ours am: 84f716320b -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 769e00cad2 is in history

Change-Id: Idcb14bc614a503637b1db870474619ab232927a8
2020-03-26 05:51:19 +00:00
Paul Hu
f28bba2033 [automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 am: 7f416f2841 -s ours am: 8077e1513e -s ours
am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 fe6c41c815 is in history

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

Change-Id: I85d1c1b1d3cafea9f390e3907797b366c17ff177
2020-03-26 05:33:20 +00:00
Automerger Merge Worker
1686ca92e9 Merge "[automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 am: 477873b6a3 -s ours" into rvc-d1-dev-plus-aosp am: 2a143525fc -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 71007d31b5 is in history

Change-Id: Ia287549cba1ceaead72a5b6498114294e8159844
2020-03-26 05:33:10 +00:00
Paul Hu
84f716320b [automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 -s ours am: 9e62cb2738 -s ours am: 3d01b0ec5f -s ours
am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 769e00cad2 is in history

Change-Id: I8d2c5f81ddee904143e150fb606b054d9edcb2ae
2020-03-26 05:32:50 +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
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
779a14e6d4 [automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 -s ours am: 5fc12a262c -s ours am: 6137aa0c1b -s ours am: 956410d16b -s ours
am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 e4beb93149 is in history

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

Change-Id: I3f6496a11a4755c3c3f35f83ba206beba208b126
2020-03-26 03:25:30 +00:00
Paul Hu
956410d16b [automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 -s ours am: 5fc12a262c -s ours am: 6137aa0c1b -s ours
am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 e4beb93149 is in history

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

Change-Id: I9b2722169bd3938709a54b9f4de7df2008cf7894
2020-03-26 03:12:15 +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
6a20b9c4cb [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 3ef31a3ccd am: 26bff21f5e -s ours am: 1d0fb22ef1 -s ours am: 3ec6219ec4 -s ours am: 1fd7fee8a2 -s ours
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 577707e09b is in history

Change-Id: I962962753afcd92d30db5b772ff67d4623efc801
2020-03-25 18:20:49 +00:00
Vladimir Marko
1fd7fee8a2 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 3ef31a3ccd am: 26bff21f5e -s ours am: 1d0fb22ef1 -s ours am: 3ec6219ec4 -s ours
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 577707e09b is in history

Change-Id: I470446e56363acbd3c4016f93ad9400abf9432b7
2020-03-25 18:01:18 +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
42ca6de235 Merge "Update connected clients when a downstream disappears." am: 22e8c3350b am: bd69be52b1 am: b989c19abf am: 5572992eff am: 67e63389d3
Change-Id: I6e572f32d0dcb8cbec6f7e2c3d8d0e6fafbfb25f
2020-03-25 16:48:53 +00:00
Vladimir Marko
ec5855b342 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: 30f004353b am: 3b71c4ee72 am: 75ef822ff2
Change-Id: Iffe35334479032a7618a916a2b903fafcb1222fe
2020-03-25 16:35:36 +00:00
Automerger Merge Worker
66a3783c2e Merge "Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: a9be265783" into rvc-d1-dev-plus-aosp am: 98916503ba am: 2b91ffab16
Change-Id: If95326b54ccc933345c05714f9e33f150a7be99b
2020-03-25 16:34:43 +00:00
Treehugger Robot
67e63389d3 Merge "Update connected clients when a downstream disappears." am: 22e8c3350b am: bd69be52b1 am: b989c19abf am: 5572992eff
Change-Id: If58d19247c2443a7bed868d18bb83d9a60256c6c
2020-03-25 16:03:47 +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
75ef822ff2 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: 30f004353b am: 3b71c4ee72
Change-Id: Ib95a0371fe9ad31ff0430fec0c4c198df8e212f6
2020-03-25 14:03:34 +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
Automerger Merge Worker
2b91ffab16 Merge "Merge "Add permitted_packages to framework-tethering." into rvc-dev am: b9492b7be0 am: a9be265783" into rvc-d1-dev-plus-aosp am: 98916503ba
Change-Id: I9c9ce15a06ed88d7e51b01719b87c6bcf338899c
2020-03-25 13:54:50 +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