Commit Graph

438 Commits

Author SHA1 Message Date
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
Treehugger Robot
46e3a9caf6 Merge "Add a log message if enabling Ethernet tethering if it is already enabled." am: 93a404041d am: 232904e22b
Change-Id: Ibe0d3567185b4dfbfd73d085080ca90594120c1f
2020-03-24 15:23:51 +00:00
Treehugger Robot
232904e22b Merge "Add a log message if enabling Ethernet tethering if it is already enabled." am: 93a404041d
Change-Id: I615b8ebc69de6d35a8dcc4e64f578c3687d279cc
2020-03-24 15:13:07 +00:00
Treehugger Robot
93a404041d Merge "Add a log message if enabling Ethernet tethering if it is already enabled." 2020-03-24 14:54:44 +00:00
Lorenzo Colitti
6976fae02e Add a log message if enabling Ethernet tethering if it is already enabled.
Test: builds
Bug: 150644681
Change-Id: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
2020-03-24 13:28:53 +00:00
markchien
58e3896aa8 Expose netId by adding getter API
Bug: 151156820
Test: m
      atest TetetheringTests

Clean CP from ag/10747732

Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
Merged-In: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
2020-03-24 09:19:26 +00:00
paulhu
769e00cad2 [TNU03] Add TetheringNotificationUpdaterTest
Add new test for TetheringNotificationUpdater

Bug: 122085773
Bug: 130596698
Test: atest TetheringTests
Change-Id: I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15
2020-03-24 15:35:05 +08:00
paulhu
7bfbe253d7 [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
2020-03-24 14:31:03 +08:00
TreeHugger Robot
d1a0afc41f [automerger skipped] Merge "Give tethering bluetooth privilege permission" into rvc-dev am: 0c7a4edf14 -s ours
am skip reason: Change-Id Ib87a5d5a5bb49390aa55e52713bb3539d4a52348 with SHA-1 db2a16b8c4 is in history

Change-Id: Ia945b9c377dcae2a3cd7978e059e5b257ace82c0
2020-03-24 03:58:28 +00:00
TreeHugger Robot
0c7a4edf14 Merge "Give tethering bluetooth privilege permission" into rvc-dev 2020-03-24 03:54:00 +00:00
markchien
5a76a7114d Give tethering bluetooth privilege permission
Permisssion of PanService#setBluetoothTethering is change from
BLUETOOTH_ADMIN to BLUETOOTH_PRIVILEGED.
Tethering service need bluetooth privilege permission to enable
bluetooth tethering.

Bug: 146045934
Test: on/off bluetooth tethering
Merged-In: Ib87a5d5a5bb49390aa55e52713bb3539d4a52348
Change-Id: Ib87a5d5a5bb49390aa55e52713bb3539d4a52348
2020-03-23 11:42:39 -07:00
Anton Hansson
d1dcdd544f Merge "Build tethering against the module SDK" into rvc-dev am: bcd7f7fc94
Change-Id: I4871c7527b859e8da5090002a0f031cf0315aed9
2020-03-23 10:53:54 +00:00
Anton Hansson
bcd7f7fc94 Merge "Build tethering against the module SDK" into rvc-dev 2020-03-23 10:27:31 +00:00
Junyu Lai
534d93fafb [automerger skipped] Merge "Address API council review comment about TetheringRequest" am: 0d8b1cfa6d am: aef3194eca -s ours
am skip reason: Change-Id I0158d88e364772f9ac258bd18955edcdad266ad8 with SHA-1 e3b9708c3a is in history

Change-Id: Iee4232c13e9085ccab062bd9b1c6c05de4ca2c0e
2020-03-23 10:14:41 +00:00
Junyu Lai
aef3194eca Merge "Address API council review comment about TetheringRequest" am: 0d8b1cfa6d
Change-Id: I7c674dcf0ed946b049784a02126cb2f6436bd4cb
2020-03-23 09:58:02 +00:00
TreeHugger Robot
9d17078f1a Merge "Address API council review comment about TetheringRequest" into rvc-dev am: 9c02d0360e
Change-Id: I2a4e50e12193421464a25d9ca0705d879b5ddfa8
2020-03-23 06:19:27 +00:00
junyulai
a8b377747b Address API council review comment about TetheringRequest
Test: atest TetheringTests FrameworksNetTests NetworkStackTests
Bug: 152055812
Change-Id: I0158d88e364772f9ac258bd18955edcdad266ad8
Merged-In: I0158d88e364772f9ac258bd18955edcdad266ad8
(this is a clean cherry-pick from ag/10796412)

Change-Id: I64f1527d79085cc5dfd78c01a6c49c4df87c82e7
2020-03-23 14:14:22 +08:00
junyulai
e3b9708c3a Address API council review comment about TetheringRequest
Test: atest TetheringTests FrameworksNetTests NetworkStackTests
Bug: 152055812
Change-Id: I0158d88e364772f9ac258bd18955edcdad266ad8
2020-03-23 12:13:57 +08:00
Remi NGUYEN VAN
646d8669db [automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9 am: f1d5385bde -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 b8fecf4b32 is in history

Change-Id: I278c197256ccd394636c8283a5988ad57b5d7bfe
2020-03-23 04:04:40 +00:00
Remi NGUYEN VAN
f1d5385bde Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9
Change-Id: I4fa3f771fe93e9b6024828d9c725502629c1ccff
2020-03-23 03:48:08 +00:00
Remi NGUYEN VAN
1cd0dcc4a9 Merge changes from topic "netstack_constant_cherrypick"
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-23 03:33:58 +00:00
Remi NGUYEN VAN
fd50cff7c6 Remove usage of Context.NETWORK_STACK_SERVICE
The NetworkStack.getService() API should be used instead.

Bug: 151243982
Test: atest FrameworksNetTests TetheringTests
      Manual tethering test
Merged-In: I7855090bffbe895c8349ad4903b8f2eb55515f0b
(clean cherry-pick from internal branch)

Change-Id: If4af2846a82605e828287a9a4680d5547b76b802
2020-03-23 11:29:06 +09:00
Anton Hansson
aaeaa195b8 Build tethering against the module SDK
Link against the stubs of other modules and the implementation
of the tethering module jar.

Bug: 146757305
Test: m Tethering
Change-Id: I7c93b60654e21a4a27d21cbf0c2a6cb21f813529
2020-03-20 15:31:02 +00:00
Paul Hu
f9ab322784 [automerger skipped] Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1 -s ours
am skip reason: Change-Id I7302cf351b0a9a42ad5a543f61ab084de189f282 with SHA-1 74165f0b29 is in history

Change-Id: I503b7fa51324c2e40e0e31e4e9c27048a93e6f23
2020-03-20 14:55:24 +00:00
Paul Hu
02538d0ad1 Merge "[TNU1.1] Update tethering notification strings" into rvc-dev 2020-03-20 14:49:27 +00:00
Anton Hansson
0ae7cbb776 [automerger skipped] Merge "Update tethering module api files" am: 7a25ae95c7 am: 1f47f6af86 -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 f1332573bb is in history

Change-Id: I124f0959b7a197607dd281fb3e00e640f10a8d37
2020-03-20 14:14:49 +00:00
Anton Hansson
1f47f6af86 Merge "Update tethering module api files" am: 7a25ae95c7
Change-Id: I6c234df71f5fca169da457c2b066ce1e7946a0f4
2020-03-20 14:02:32 +00:00
Anton Hansson
7a25ae95c7 Merge "Update tethering module api files" 2020-03-20 13:50:24 +00:00
Anton Hansson
4168cea5e1 Update tethering module api files
Bug: 147768409
Test: m checkapi
Merged-In: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
Change-Id: I3da71661048b1f66522696e9333c2c14a224fe9f
2020-03-20 13:49:34 +00:00
Anton Hansson
fd9cde0cac [automerger skipped] Merge "Add individual API tracking files for modules" am: 4dd8a42cff am: 5f6db2c1f9 -s ours
am skip reason: Change-Id Iaf2ef5b5751eb208d119ddbc74481239366fe581 with SHA-1 49bdf5615f is in history

Change-Id: Icf93c1b23cfd39d899ba517ec6940b1cbd1991cb
2020-03-20 13:23:18 +00:00
Anton Hansson
5f6db2c1f9 Merge "Add individual API tracking files for modules" am: 4dd8a42cff
Change-Id: I0e1d85dc1bc3936ed849a86bff3a4722deb897d9
2020-03-20 13:01:11 +00:00
Anton Hansson
4dd8a42cff Merge "Add individual API tracking files for modules" 2020-03-20 12:47:52 +00:00
Junyu Lai
09c8d8f1b5 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388
Change-Id: Ia2b117da5d9331d63a9b4814ae8d26dbbdf3275f
2020-03-20 11:23:57 +00:00
Junyu Lai
6bf64c655b Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717
Change-Id: I826f8a561b2bd0f456302247f90d26ffc42c42df
2020-03-20 11:23:27 +00:00
Chalard Jean
1f83e37fa1 Create a builder for NetworkCapabilities. am: db3d568139
Change-Id: I3d7a595d25b65ff4f5762c83a3dfc82c0f5ddc2d
2020-03-20 11:08:52 +00:00
Junyu Lai
0fb2814388 Merge "Create a builder for NetworkCapabilities." into rvc-dev 2020-03-20 11:03:47 +00:00
Junyu Lai
cf99dc2717 Merge "Expose netId by adding getter API" into rvc-dev 2020-03-20 11:03:05 +00:00
Paul Hu
d685312245 [TNU1.1] Update tethering notification strings
Update string for no upstream and cellular roaming notification.

Bug: 145629001
Bug: 147818698
Test: atest TetheringTests
Change-Id: I7302cf351b0a9a42ad5a543f61ab084de189f282
Merged-In: I7302cf351b0a9a42ad5a543f61ab084de189f282
(cherry picked from aosp/1261866)
2020-03-20 10:05:57 +00:00
Paul Hu
42cfc3f5aa Merge "[TNU1.1] Update tethering notification strings" am: 7f69e09d79 am: cb2d2f984c
Change-Id: Ia0584cab00f0ca5e76f6cde337630153c86524c7
2020-03-20 09:04:40 +00:00
Paul Hu
cb2d2f984c Merge "[TNU1.1] Update tethering notification strings" am: 7f69e09d79
Change-Id: I2b47fc153faeaf63a29b19d9773fb29b305fe2c8
2020-03-20 08:46:24 +00:00
TreeHugger Robot
3a26ae0f66 [automerger skipped] Merge "[TNU1.2] Add string for client number notification" into rvc-dev am: 07bb07217a -s ours
am skip reason: Change-Id Icc4e59ce3b2d8d4c1c7883c2f9d040d3ce563f09 with SHA-1 1957e6a0fb is in history

Change-Id: I6c0eb4be6df9061dad68ecc20813ec379cb5b828
2020-03-20 00:17:17 +00:00
TreeHugger Robot
07bb07217a Merge "[TNU1.2] Add string for client number notification" into rvc-dev 2020-03-20 00:11:33 +00:00