Commit Graph

8338 Commits

Author SHA1 Message Date
Automerger Merge Worker
23976cad40 Merge changes I446a8595,I68d2293f am: 3914abccce am: 3f8a000e5c am: dd8b4569b6
Change-Id: I99a531ab5ed8645d3eb3d15a3cd4ed6ef30c89ab
2020-02-03 22:53:15 +00:00
Automerger Merge Worker
dd8b4569b6 Merge changes I446a8595,I68d2293f am: 3914abccce am: 3f8a000e5c
Change-Id: I27a4344fa2e3b91fe31e02bf41f20a2bc11c2ff6
2020-02-03 22:41:20 +00:00
Automerger Merge Worker
3f8a000e5c Merge changes I446a8595,I68d2293f am: 3914abccce
Change-Id: I8422163249ca637ab71b71777feded76e3225c2e
2020-02-03 22:34:25 +00:00
Benedict Wong
3914abccce 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
509cf84538 Merge changes If8c8d1f3,I3a804a9f am: 49c185e487 am: dff0d295a9 am: df7c6a7ab2
Change-Id: I69e6b412f150419baa9dc1860d190d85bfdfc47d
2020-02-03 15:18:41 +00:00
Automerger Merge Worker
71f6713369 Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 5b6967bc01 am: b14259e0bd am: cffbf59942
Change-Id: Icd75afae770c93ac6fdb611e220d8723c07771ac
2020-02-03 15:18:32 +00:00
Automerger Merge Worker
e91b906438 Merge "Add callback registration in ConnectivityService." am: 29edc0ecc9 am: 89a5e805f9 am: 7d4ebb11d6
Change-Id: I596d4788f6d35f1adf110d8edd390f5632b4dc06
2020-02-03 15:18:18 +00:00
Automerger Merge Worker
df7c6a7ab2 Merge changes If8c8d1f3,I3a804a9f am: 49c185e487 am: dff0d295a9
Change-Id: I1a0085ad35ca95cab4086d4779ee15322094c2f6
2020-02-03 15:12:20 +00:00
Automerger Merge Worker
cffbf59942 Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 5b6967bc01 am: b14259e0bd
Change-Id: Ie1ee81c6050df22b6e3cf9b752e34a1b01430634
2020-02-03 15:12:13 +00:00
Automerger Merge Worker
7d4ebb11d6 Merge "Add callback registration in ConnectivityService." am: 29edc0ecc9 am: 89a5e805f9
Change-Id: I88ab7b749860a0f94857743ba759bb47270857f6
2020-02-03 15:12:02 +00:00
Automerger Merge Worker
dff0d295a9 Merge changes If8c8d1f3,I3a804a9f am: 49c185e487
Change-Id: I6139500edf9c93d2995b822b19e9e9aaf3beaa7c
2020-02-03 15:07:46 +00:00
Automerger Merge Worker
b14259e0bd Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 5b6967bc01
Change-Id: Ia393d1ee102ae7dfc4a7b5698b5f3b4882605e7c
2020-02-03 15:07:20 +00:00
Automerger Merge Worker
89a5e805f9 Merge "Add callback registration in ConnectivityService." am: 29edc0ecc9
Change-Id: Idf067ebd9299ca036965b7c7f82c13a6f659a821
2020-02-03 15:06:50 +00:00
Treehugger Robot
49c185e487 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
5b6967bc01 Merge "Update javadocs for ConnectivityDiagnosticsManager." 2020-02-03 14:56:13 +00:00
Cody Kesting
29edc0ecc9 Merge "Add callback registration in ConnectivityService." 2020-02-03 14:55:54 +00:00
Cody Kesting
ad51e01b3c 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
73708bff55 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
c16cd77698 [automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: ca6e20c5d2 am: 196e334a59 am: b65ee4bbc1 -s ours
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 c19c94fe9b is in history

Change-Id: I306a831e47c08ac37de93285763500b73a4624ec
2020-01-31 16:47:44 +00:00
Automerger Merge Worker
b65ee4bbc1 Merge changes Iaa6f0d65,I68a16b64 am: ca6e20c5d2 am: 196e334a59
Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2
2020-01-31 16:43:27 +00:00
Automerger Merge Worker
196e334a59 Merge changes Iaa6f0d65,I68a16b64 am: ca6e20c5d2
Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817
2020-01-31 16:37:49 +00:00
Automerger Merge Worker
3e7018aa4f Merge "Add tests to services/tests/net test mapping" am: 543ecddcdc am: 9da1147695 am: 81bc04b765
Change-Id: Ib4632d4e3a42e56c5c841f4cc13709d91b4cab10
2020-01-31 16:31:45 +00:00
Automerger Merge Worker
21c0840aa6 [automerger skipped] Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: ac6f266ef7 am: 7538c0dbdd -s ours
am skip reason: Change-Id I8b8df5096b90ad10545087ab09f68ecae637aa35 with SHA-1 6079c4d8eb is in history

Change-Id: I1fdecfaf7c028ea5999a97298f0649748773001d
2020-01-31 16:31:06 +00:00
Automerger Merge Worker
ace1f433fd [automerger skipped] Make most of NetworkAgent @SystemApi. am: d60481ce20 am: 940b91d9d5 am: ab1fcfae8c -s ours
am skip reason: Change-Id I856f01f02c35c2f6a886d8b98039e5dfbc48148b with SHA-1 980ed12f7f is in history

Change-Id: I9d1f5297925972196fd8bb21afa58f5a1a12ddfd
2020-01-31 16:31:00 +00:00
Automerger Merge Worker
81bc04b765 Merge "Add tests to services/tests/net test mapping" am: 543ecddcdc am: 9da1147695
Change-Id: I8c03db23b28eb231f352b578ca3faa33d519aed8
2020-01-31 16:29:48 +00:00
Automerger Merge Worker
7538c0dbdd Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: ac6f266ef7
Change-Id: If280205257c6d8d6b0630c483ff307ee39e3ece7
2020-01-31 16:28:44 +00:00
Automerger Merge Worker
ab1fcfae8c Make most of NetworkAgent @SystemApi. am: d60481ce20 am: 940b91d9d5
Change-Id: I3119a05b9db4716cc7c78a7537ecc89a56e88264
2020-01-31 16:28:40 +00:00
Automerger Merge Worker
9da1147695 Merge "Add tests to services/tests/net test mapping" am: 543ecddcdc
Change-Id: Id503a2daac1a508095b388aa8524342141571d6e
2020-01-31 16:27:45 +00:00
Automerger Merge Worker
ac6f266ef7 Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f
Change-Id: I04d08ae82530481d6ea49120107772d37fdc1627
2020-01-31 16:25:23 +00:00
Automerger Merge Worker
940b91d9d5 Make most of NetworkAgent @SystemApi. am: d60481ce20
Change-Id: Ie36bfb9a1bed114fe628ad6c1b935d587cc3160d
2020-01-31 16:25:20 +00:00
Chalard Jean
9eece865c0 Merge "Add public fields to NetworkScore and make it @SystemApi" 2020-01-31 03:06:16 +00:00
Benedict Wong
79ea64f963 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
df936cf1a7 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
ca6e20c5d2 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
8d0ca5efde 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
511f7e3792 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
543ecddcdc Merge "Add tests to services/tests/net test mapping" 2020-01-30 06:20:39 +00:00
markchien
e1322a8a8e 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
d60481ce20 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 980ed12f7f)
2020-01-29 16:45:03 -08:00
Automerger Merge Worker
70250dc8e8 [automerger skipped] Merge "API changes for IPv6 MTU support" am: b36aaf9fae am: 4d085e38ec am: 2829a42117 -s ours
am skip reason: Change-Id I43c7e088e46e40f38d8114548e0fc4e39d7f91cb with SHA-1 d30bfe0174 is in history

Change-Id: Ia8b26d50299dfb07178d0adef52cc422317070e9
2020-01-29 16:59:42 +00:00
Automerger Merge Worker
2829a42117 Merge "API changes for IPv6 MTU support" am: b36aaf9fae am: 4d085e38ec
Change-Id: I08a8a0800d11a643281775d2f9dea5d13334c8f7
2020-01-29 16:37:38 +00:00
Sarah Chin
4d085e38ec Merge "API changes for IPv6 MTU support"
am: b36aaf9fae

Change-Id: I80f206245b9340a9df8b65c0e42413617eecadfb
2020-01-29 08:08:45 -08:00
Sarah Chin
b36aaf9fae Merge "API changes for IPv6 MTU support" 2020-01-29 15:56:09 +00:00
Sarah Chin
f75d09fac1 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
0c7b9a9eb7 [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
d8bea3bb90 [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
9356f926cd [automerger skipped] Merge "Add implementation of getInterfaceHash()" am: bc2cbc7499 am: 8a0d3e5cdf am: 48af443a18 -s ours
am skip reason: Change-Id I314f19aeca82cc8653eab71c9526ea7a208e6b50 with SHA-1 ead2e7bbb1 is in history

Change-Id: I5410c6c461d1dc78d2722a3d9f0d6c9b31376b17
2020-01-29 05:47:27 +00:00
Automerger Merge Worker
48af443a18 Merge "Add implementation of getInterfaceHash()" am: bc2cbc7499 am: 8a0d3e5cdf
Change-Id: I4232678f9f597e132b11556343ea7a6cd3406769
2020-01-29 05:28:30 +00:00
Paul Trautrim
8a0d3e5cdf Merge "Add implementation of getInterfaceHash()"
am: bc2cbc7499

Change-Id: I4d69160572a16e8095e31e641d516f322941da7d
2020-01-28 21:19:13 -08:00
Paul Trautrim
bc2cbc7499 Merge "Add implementation of getInterfaceHash()" 2020-01-29 05:12:12 +00:00