Commit Graph

8339 Commits

Author SHA1 Message Date
Benedict Wong
b3e30be7e4 Add separate user consent for Platform VPNs
This change adds a new VPN user consent flow (using the same text) for
granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new
PlatformVpnConfirmDialog is created as a subclass to preserve all logic,
but ensure the right appop is granted for the relevant dialog.

Intent extras were considered, but are inherently unsafe, since the
caller may add any extras that they would want.

Bug: 144246835
Test: FrameworksNetTests passing
Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3
2020-02-03 19:05:23 -08:00
Automerger Merge Worker
515d47543a Merge changes I446a8595,I68d2293f am: 0561b934dc am: 54e08a83e9 am: 436df92fee
Change-Id: I99a531ab5ed8645d3eb3d15a3cd4ed6ef30c89ab
2020-02-03 22:53:15 +00:00
Automerger Merge Worker
436df92fee Merge changes I446a8595,I68d2293f am: 0561b934dc am: 54e08a83e9
Change-Id: I27a4344fa2e3b91fe31e02bf41f20a2bc11c2ff6
2020-02-03 22:41:20 +00:00
Automerger Merge Worker
54e08a83e9 Merge changes I446a8595,I68d2293f am: 0561b934dc
Change-Id: I8422163249ca637ab71b71777feded76e3225c2e
2020-02-03 22:34:25 +00:00
Benedict Wong
0561b934dc Merge changes I446a8595,I68d2293f
* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs
2020-02-03 22:31:37 +00:00
Automerger Merge Worker
d9a2a9289d Merge changes If8c8d1f3,I3a804a9f am: 069d78ccce am: b42c3d86b5 am: f53b30d1f2
Change-Id: I69e6b412f150419baa9dc1860d190d85bfdfc47d
2020-02-03 15:18:41 +00:00
Automerger Merge Worker
c2832f2603 Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 162a762c57 am: 968afd99fb am: 042566cf20
Change-Id: Icd75afae770c93ac6fdb611e220d8723c07771ac
2020-02-03 15:18:32 +00:00
Automerger Merge Worker
a672f64245 Merge "Add callback registration in ConnectivityService." am: 49c3b00b1a am: bbb915b13f am: e2422892c6
Change-Id: I596d4788f6d35f1adf110d8edd390f5632b4dc06
2020-02-03 15:18:18 +00:00
Automerger Merge Worker
f53b30d1f2 Merge changes If8c8d1f3,I3a804a9f am: 069d78ccce am: b42c3d86b5
Change-Id: I1a0085ad35ca95cab4086d4779ee15322094c2f6
2020-02-03 15:12:20 +00:00
Automerger Merge Worker
042566cf20 Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 162a762c57 am: 968afd99fb
Change-Id: Ie1ee81c6050df22b6e3cf9b752e34a1b01430634
2020-02-03 15:12:13 +00:00
Automerger Merge Worker
e2422892c6 Merge "Add callback registration in ConnectivityService." am: 49c3b00b1a am: bbb915b13f
Change-Id: I88ab7b749860a0f94857743ba759bb47270857f6
2020-02-03 15:12:02 +00:00
Automerger Merge Worker
b42c3d86b5 Merge changes If8c8d1f3,I3a804a9f am: 069d78ccce
Change-Id: I6139500edf9c93d2995b822b19e9e9aaf3beaa7c
2020-02-03 15:07:46 +00:00
Automerger Merge Worker
968afd99fb Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 162a762c57
Change-Id: Ia393d1ee102ae7dfc4a7b5698b5f3b4882605e7c
2020-02-03 15:07:20 +00:00
Automerger Merge Worker
bbb915b13f Merge "Add callback registration in ConnectivityService." am: 49c3b00b1a
Change-Id: Idf067ebd9299ca036965b7c7f82c13a6f659a821
2020-02-03 15:06:50 +00:00
Treehugger Robot
069d78ccce Merge changes If8c8d1f3,I3a804a9f
* changes:
  [NS A27] Remove useless logs and a useless var
  [NS A26] Move available callbacks out of the rematch computation
2020-02-03 15:06:19 +00:00
Cody Kesting
162a762c57 Merge "Update javadocs for ConnectivityDiagnosticsManager." 2020-02-03 14:56:13 +00:00
Cody Kesting
49c3b00b1a Merge "Add callback registration in ConnectivityService." 2020-02-03 14:55:54 +00:00
Cody Kesting
6d8560dcce Update javadocs for ConnectivityDiagnosticsManager.
ConnectivityDiagnosticsManager comments for
registerConnectivityDiagnosticsCallback and
unregisterConnectivityDiagnosticsCallback are updated to reflect several
changes.

For register calls, any app will be able to register callbacks, but only
permissioned applications will have their callbacks invoked (and only
for networks managed by the application). Additionally, only the
registering app (uid) will be able to unregister a callback once
registered.

Bug: 143187964
Test: docs change only. compiles.
Change-Id: Ie7ae86a1afccb22d6c84027dbac49d7b8e431e8c
2020-01-31 09:49:25 -08:00
Cody Kesting
0ffbf92e0c Add callback registration in ConnectivityService.
ConnectivityDiagnosticsManager will send callbacks to
ConnectivityService for registering and unregistering them with the
system. ConnectivityService needs to do the processing for persisting
(and deleting) these callbacks on the ConnectivityService Thread, so
messages are sent to the Connectivity Diagnostics  Handler, which runs
on the ConnectivityService Thread.

Bug: 146444622
Bug: 143187964
Bug: 147848028
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Ia5c8f90a60c050504e8676de9564a7607a9b03bc
2020-01-31 09:42:05 -08:00
Automerger Merge Worker
005077ff2c [automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: 757efa5551 am: f3ac65de98 am: 5159f2ac7d -s ours
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 95956ba7a7 is in history

Change-Id: I306a831e47c08ac37de93285763500b73a4624ec
2020-01-31 16:47:44 +00:00
Automerger Merge Worker
5159f2ac7d Merge changes Iaa6f0d65,I68a16b64 am: 757efa5551 am: f3ac65de98
Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2
2020-01-31 16:43:27 +00:00
Automerger Merge Worker
f3ac65de98 Merge changes Iaa6f0d65,I68a16b64 am: 757efa5551
Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817
2020-01-31 16:37:49 +00:00
Automerger Merge Worker
723fb29cc4 Merge "Add tests to services/tests/net test mapping" am: f4ff6fa293 am: 82a2425dad am: 2a99156af7
Change-Id: Ib4632d4e3a42e56c5c841f4cc13709d91b4cab10
2020-01-31 16:31:45 +00:00
Automerger Merge Worker
4f8161d2dd [automerger skipped] Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: 49bf0c8f8a am: a777e6b5a4 -s ours
am skip reason: Change-Id I8b8df5096b90ad10545087ab09f68ecae637aa35 with SHA-1 c23c7ba222 is in history

Change-Id: I1fdecfaf7c028ea5999a97298f0649748773001d
2020-01-31 16:31:06 +00:00
Automerger Merge Worker
60334bf537 [automerger skipped] Make most of NetworkAgent @SystemApi. am: 298b1ebbf6 am: cb4da50356 am: 16fe2252bc -s ours
am skip reason: Change-Id I856f01f02c35c2f6a886d8b98039e5dfbc48148b with SHA-1 10a12966c2 is in history

Change-Id: I9d1f5297925972196fd8bb21afa58f5a1a12ddfd
2020-01-31 16:31:00 +00:00
Automerger Merge Worker
2a99156af7 Merge "Add tests to services/tests/net test mapping" am: f4ff6fa293 am: 82a2425dad
Change-Id: I8c03db23b28eb231f352b578ca3faa33d519aed8
2020-01-31 16:29:48 +00:00
Automerger Merge Worker
a777e6b5a4 Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: 49bf0c8f8a
Change-Id: If280205257c6d8d6b0630c483ff307ee39e3ece7
2020-01-31 16:28:44 +00:00
Automerger Merge Worker
16fe2252bc Make most of NetworkAgent @SystemApi. am: 298b1ebbf6 am: cb4da50356
Change-Id: I3119a05b9db4716cc7c78a7537ecc89a56e88264
2020-01-31 16:28:40 +00:00
Automerger Merge Worker
82a2425dad Merge "Add tests to services/tests/net test mapping" am: f4ff6fa293
Change-Id: Id503a2daac1a508095b388aa8524342141571d6e
2020-01-31 16:27:45 +00:00
Automerger Merge Worker
49bf0c8f8a Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f
Change-Id: I04d08ae82530481d6ea49120107772d37fdc1627
2020-01-31 16:25:23 +00:00
Automerger Merge Worker
cb4da50356 Make most of NetworkAgent @SystemApi. am: 298b1ebbf6
Change-Id: Ie36bfb9a1bed114fe628ad6c1b935d587cc3160d
2020-01-31 16:25:20 +00:00
Chalard Jean
5f8f467f44 Merge "Add public fields to NetworkScore and make it @SystemApi" 2020-01-31 03:06:16 +00:00
Benedict Wong
6d9adb82e6 Add VpnManager calls to ConnectivityService
This commit adds the relevant calls to ConnectivityService for the
VpnManager API to be functional

Bug: 144246837
Test: VpnManagerTest updated, FrameworksNetTests passing
Change-Id: I446a8595e3583a842a7f89c4f8d74526a85e311c
2020-01-30 18:55:07 -08:00
Benedict Wong
419a6f06f9 Add basic logic for profile-based VPNs
This change adds stubs for the Platform built-in VPNs, along with
implementing some basic permissions checks.

Bug: 144246837
Test: FrameworksNetTests passing, new tests added
Change-Id: I68d2293fc1468544f0d9f64d02ea7e1c80c8d18c
2020-01-30 18:41:12 -08:00
David Su
757efa5551 Merge changes Iaa6f0d65,I68a16b64
* changes:
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 22:42:16 +00:00
David Su
e89caf232d Merge changes from topic "api-review-removedoublequotes"
* changes:
  SettingsLib: Rename removeDoubleQuotes to sanitizeSsid
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 18:16:53 +00:00
Chalard Jean
a9727279ae Add public fields to NetworkScore and make it @SystemApi
Bug: 113554781
Bug: 146583853
Test: FrameworksNetTests
Change-Id: I19d965c0146196cb67b3417eb1790ccd90ce3233
2020-01-30 18:45:52 +09:00
Remi NGUYEN VAN
f4ff6fa293 Merge "Add tests to services/tests/net test mapping" 2020-01-30 06:20:39 +00:00
markchien
f4906c8a8c NetworkAgent: Fix doc build fail by invalid tag
Bug: 138306002
Bug: 139268426
Test: make doc-comment-check-docs

Change-Id: I8b8df5096b90ad10545087ab09f68ecae637aa35
Merged-In: I8b8df5096b90ad10545087ab09f68ecae637aa35
2020-01-30 03:37:45 +00:00
sqian
298b1ebbf6 Make most of NetworkAgent @SystemApi.
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: I856f01f02c35c2f6a886d8b98039e5dfbc48148b
Merged-In: I856f01f02c35c2f6a886d8b98039e5dfbc48148b
(cherry picked from commit 10a12966c2)
2020-01-29 16:45:03 -08:00
Automerger Merge Worker
e7af61daca [automerger skipped] Merge "API changes for IPv6 MTU support" am: 16cea243ab am: 96ec4a9377 am: 9071679de1 -s ours
am skip reason: Change-Id I43c7e088e46e40f38d8114548e0fc4e39d7f91cb with SHA-1 50169af6ad is in history

Change-Id: Ia8b26d50299dfb07178d0adef52cc422317070e9
2020-01-29 16:59:42 +00:00
Automerger Merge Worker
9071679de1 Merge "API changes for IPv6 MTU support" am: 16cea243ab am: 96ec4a9377
Change-Id: I08a8a0800d11a643281775d2f9dea5d13334c8f7
2020-01-29 16:37:38 +00:00
Sarah Chin
96ec4a9377 Merge "API changes for IPv6 MTU support"
am: 16cea243ab

Change-Id: I80f206245b9340a9df8b65c0e42413617eecadfb
2020-01-29 08:08:45 -08:00
Sarah Chin
16cea243ab Merge "API changes for IPv6 MTU support" 2020-01-29 15:56:09 +00:00
Sarah Chin
707c0e96d5 API changes for IPv6 MTU support
Change mtu->mtuV4 and add mtuV6 for DataProfile and DataCallResult
Add mtu to RouteInfo and update test

Test: atest FrameworksTelephonyTests
Bug: 146668814
Change-Id: I43c7e088e46e40f38d8114548e0fc4e39d7f91cb
Merged-In: I43c7e088e46e40f38d8114548e0fc4e39d7f91cb
2020-01-30 00:17:19 +09:00
Chalard Jean
5b7858eeb1 [NS A27] Remove useless logs and a useless var
These logs haven't found a bug in a long time and we now have
some structural guarantees that the conditions they check for
can't happen (like the checks that everything is happening on
the same thread).
Maybe we'll reinstate similar checks later, but for now they
are in the way and removing them is a small sacrifice for the
intended benefit.

The local was simply not used any more.

Test: FrameworksNetTests
Change-Id: If8c8d1f3eb883ffcf0fbdb70824b87dd70da507c
2020-01-29 19:47:16 +09:00
Chalard Jean
bf56ab538b [NS A26] Move available callbacks out of the rematch computation
Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I3a804a9f6eaf50a3995eaaf6469a1c2b9387be14
2020-01-29 19:47:11 +09:00
Automerger Merge Worker
d628b75774 [automerger skipped] Merge "Add implementation of getInterfaceHash()" am: 95f9335a7d am: 3230683757 am: 6edec02913 -s ours
am skip reason: Change-Id I314f19aeca82cc8653eab71c9526ea7a208e6b50 with SHA-1 beee5ed7ef is in history

Change-Id: I5410c6c461d1dc78d2722a3d9f0d6c9b31376b17
2020-01-29 05:47:27 +00:00
Automerger Merge Worker
6edec02913 Merge "Add implementation of getInterfaceHash()" am: 95f9335a7d am: 3230683757
Change-Id: I4232678f9f597e132b11556343ea7a6cd3406769
2020-01-29 05:28:30 +00:00
Paul Trautrim
3230683757 Merge "Add implementation of getInterfaceHash()"
am: 95f9335a7d

Change-Id: I4d69160572a16e8095e31e641d516f322941da7d
2020-01-28 21:19:13 -08:00