Commit Graph

1530 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
5746dd5773 [automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9 am: f1d5385bde -s ours am: 646d8669db -s ours am: 0bf4e9a367 -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 b8fecf4b32 is in history

Change-Id: I54539a294224c99f9ad25d7a6e3daa90bab5e610
2020-03-23 04:39:22 +00:00
Remi NGUYEN VAN
0bf4e9a367 [automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9 am: f1d5385bde -s ours am: 646d8669db -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 b8fecf4b32 is in history

Change-Id: I061d479fc4ff068f248bcef944e801cae022ffc8
2020-03-23 04:21:16 +00: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
a61b0b3c9d [automerger skipped] Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1 -s ours am: f9ab322784 -s ours am: d478018dab -s ours
am skip reason: Change-Id I7302cf351b0a9a42ad5a543f61ab084de189f282 with SHA-1 d685312245 is in history

Change-Id: Ia4cb02551d31f7aac7a9289970e3da788f7cc898
2020-03-20 15:23:53 +00:00
Automerger Merge Worker
dd95d286d5 Merge "[automerger skipped] Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1 am: b4ce301da9 -s ours" into rvc-d1-dev-plus-aosp am: 59102d0c5c -s ours
am skip reason: Change-Id I7302cf351b0a9a42ad5a543f61ab084de189f282 with SHA-1 74165f0b29 is in history

Change-Id: I645d69508cfb9ffad1977d09fb8b9362e4ea3bf5
2020-03-20 15:23:45 +00:00
Paul Hu
d478018dab [automerger skipped] Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1 -s ours am: f9ab322784 -s ours
am skip reason: Change-Id I7302cf351b0a9a42ad5a543f61ab084de189f282 with SHA-1 d685312245 is in history

Change-Id: I0c3bfa0b634cd0cd855ceb6d4d5cdb316168cf49
2020-03-20 15:08:04 +00:00
Paul Hu
395f381046 [automerger skipped] Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1 am: b4ce301da9 -s ours
am skip reason: Change-Id I7302cf351b0a9a42ad5a543f61ab084de189f282 with SHA-1 74165f0b29 is in history

Change-Id: I41c17d0a1bf8b2b44cd08dc87e4459ff4f2f1a89
2020-03-20 15:07:52 +00:00
Paul Hu
b4ce301da9 Merge "[TNU1.1] Update tethering notification strings" into rvc-dev am: 02538d0ad1
Change-Id: Ic109e890fea24851d97930d977a87274ccbdd0e7
2020-03-20 14:55:31 +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
f5f77d117e [automerger skipped] Merge "Update tethering module api files" am: 7a25ae95c7 am: 1f47f6af86 -s ours am: 0ae7cbb776 -s ours am: 13d0c75d7a -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 f1332573bb is in history

Change-Id: Ibb5e92ee6c04db7322ecb4e61c755af845a02fbc
2020-03-20 14:36:09 +00:00
Anton Hansson
13d0c75d7a [automerger skipped] Merge "Update tethering module api files" am: 7a25ae95c7 am: 1f47f6af86 -s ours am: 0ae7cbb776 -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 f1332573bb is in history

Change-Id: I691c492be539d8304796300ae4dcfd69f96bfb36
2020-03-20 14:26:22 +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
85b16e2eb9 [automerger skipped] Merge "Add individual API tracking files for modules" am: 4dd8a42cff am: 5f6db2c1f9 -s ours am: fd9cde0cac -s ours am: 40d6c59a75 -s ours
am skip reason: Change-Id Iaf2ef5b5751eb208d119ddbc74481239366fe581 with SHA-1 49bdf5615f is in history

Change-Id: I6ebe9f6a744ae71e46f1d2825b98a7a49732d0d4
2020-03-20 13:35:07 +00:00
Anton Hansson
40d6c59a75 [automerger skipped] Merge "Add individual API tracking files for modules" am: 4dd8a42cff am: 5f6db2c1f9 -s ours am: fd9cde0cac -s ours
am skip reason: Change-Id Iaf2ef5b5751eb208d119ddbc74481239366fe581 with SHA-1 49bdf5615f is in history

Change-Id: I8cbb32fd06d411acf3211684f8a6e8c48ed725f8
2020-03-20 13:24:01 +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
1030b74c21 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388 am: 09c8d8f1b5 am: e83fbb1b36
Change-Id: Ie9d937680c7b364890ecdc084d9167f86cad92a4
2020-03-20 11:52:00 +00:00
Junyu Lai
8e8fdcf87f Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717 am: 6bf64c655b am: b819b1aeec
Change-Id: I360598a7b42d86d8b2ed63804c7d8ff3a7fdbdbe
2020-03-20 11:51:43 +00:00
Junyu Lai
7821869e79 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388 am: 94960b6034 am: 6587eb3194
Change-Id: I558bb846f0d1e621bc5fb2908767c38ca6cd9b87
2020-03-20 11:49:40 +00:00
Junyu Lai
fcdfd029fa Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717 am: 586c2a68e8 am: 560ab8a630
Change-Id: Id4240f887ef4b5cfd0fdbf38d5089ce6ada3559d
2020-03-20 11:48:49 +00:00
Junyu Lai
e83fbb1b36 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388 am: 09c8d8f1b5
Change-Id: I1b8838d9f76ff97bf981892667a5baadc004dc78
2020-03-20 11:45:30 +00:00
Junyu Lai
b819b1aeec Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717 am: 6bf64c655b
Change-Id: I550249bef0f623367a94afa5cdba92d74bbd8549
2020-03-20 11:44:38 +00:00
Junyu Lai
6587eb3194 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388 am: 94960b6034
Change-Id: I64f3961e66056025625b39b505b4f2d15bc116dd
2020-03-20 11:37:12 +00:00
Junyu Lai
560ab8a630 Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717 am: 586c2a68e8
Change-Id: Iccdd74b70f3a475e51352bcf3453910123863f5e
2020-03-20 11:36:48 +00:00
Chalard Jean
66590b3242 Create a builder for NetworkCapabilities. am: db3d568139 am: 1f83e37fa1 am: f997344ac3
Change-Id: I39cd9bcbbcf66045b093081b3626b7afa12549b6
2020-03-20 11:31:00 +00:00
Chalard Jean
b32a4bedf5 Create a builder for NetworkCapabilities. am: db3d568139 am: 93a644a555 am: a333466085
Change-Id: I9b1ebc281c646e7f1d8e3d3b281110474de4074e
2020-03-20 11:30:36 +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
94960b6034 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 0fb2814388
Change-Id: Ia89d44bcc81b16198d2d653572c451143d208a94
2020-03-20 11:23:41 +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
Junyu Lai
586c2a68e8 Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717
Change-Id: I169aabae9037f8d16fdd9e70166794173ae3c995
2020-03-20 11:23:03 +00:00
Chalard Jean
f997344ac3 Create a builder for NetworkCapabilities. am: db3d568139 am: 1f83e37fa1
Change-Id: I650abf2bf7c342aa3652139256b917ef3ed27624
2020-03-20 11:15:57 +00:00
Chalard Jean
a333466085 Create a builder for NetworkCapabilities. am: db3d568139 am: 93a644a555
Change-Id: I437e96b4aaa79e3bdeea6107970133a1df6ecf29
2020-03-20 11:15:34 +00:00
Chalard Jean
93a644a555 Create a builder for NetworkCapabilities. am: db3d568139
Change-Id: Ifbc4fae6c55abfb5aa233cf9bc57f5e14f9b583c
2020-03-20 11:08:59 +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
ad59f8d8ce Merge "[TNU1.1] Update tethering notification strings" am: 7f69e09d79 am: cb2d2f984c am: 42cfc3f5aa am: ee1570a110
Change-Id: Ie8817c9c634ca1008442b69cceab918c6cd9c55f
2020-03-20 09:29:29 +00:00
Paul Hu
ee1570a110 Merge "[TNU1.1] Update tethering notification strings" am: 7f69e09d79 am: cb2d2f984c am: 42cfc3f5aa
Change-Id: I72b19010e1f63e07bfac680df606aeaa38fc3b3d
2020-03-20 09:17:06 +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