Commit Graph

8494 Commits

Author SHA1 Message Date
Cody Kesting
d6ad3365fa Define Bundle keys for ConnectivityDiagnostics.
ConnectivityDiagnosticsManager defines several callbacks that can be
invoked for registered ConnectivityDiagnosticsCallback instances.
onConnectivityReport and onDataStallSuspected include ConnectivityReport
and DataStallReport, respectively, both of which contain a
PersistableBundle to be used for passing information from the
NetworkStack module to the registered callback. When values will be
consistently passed inside these bundles, their keys are defined inside
ConnectivityReport and DataStallReport.

Bug: 147249364
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Icc6bd4337865692b6ca7c18eacabff59ba3a5bb9
2020-01-23 00:49:17 -08:00
Cody Kesting
896939854b Add list of Administrator UIDs to NetworkCapabilities.
Adds a list of administrator UIDs to NetworkCapabilties. The carrier
privilege permission model allows multiple uids to be granted
network-management privileges via certificates stored on a SIM card or
in CarrierConfigManager. The current NetworkCapabilities only allows a
single uid to be stored to track the owner of the network - this change
remedies that discrepancy.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I3169d31e0270c976a720e80363cb268cbafd0455
2020-01-22 23:59:56 -08:00
Automerger Merge Worker
7d995a3a6d Merge "Fix generic inferred type argument." am: 7e5cce2c67 am: e3acc01753
Change-Id: Ia4a304e8a62ca920cf51647ced2a1ea841c8dca2
2020-01-23 07:09:35 +00:00
Cody Kesting
e3acc01753 Merge "Fix generic inferred type argument."
am: 7e5cce2c67

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84
2020-01-22 22:45:49 -08:00
Treehugger Robot
7e5cce2c67 Merge "Fix generic inferred type argument." 2020-01-23 06:39:57 +00:00
Automerger Merge Worker
53133f708e Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 6e1557d8ca
Change-Id: I91759cf3b68f89500352c6d952643a45e0665ee2
2020-01-23 06:18:15 +00:00
Benedict Wong
6e1557d8ca Merge changes from topic "add-ikev2-vpn-types"
am: adb79e3b39

Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e
2020-01-22 22:09:41 -08:00
Cody Kesting
ec88fda4a8 Fix generic inferred type argument.
Test: compiles.
Test: atest FrameworksNetTests
Change-Id: I0dffb3f44fb465ac8bae3c41f26176e86f65e825
2020-01-22 20:26:08 -08:00
Automerger Merge Worker
b2a91a533d Merge changes from topic "connectivity-diagnostics-system-server" am: 880e0654e7 am: d2e0f29a08
Change-Id: Iae96f4e55ff74b48275b1559443ba982bb935bbc
2020-01-23 03:28:21 +00:00
Benedict Wong
80240acd3f Add VpnManger API surface
This change adds the VpnManager, which will be used by apps to install
profiles for all platform VPN types (currently only IKEv2).

Bug: 143325939
Test: Compiles, FrameworksNetTests passing.
Change-Id: I57f854d0a5b18358f3541c24ca0cd8aed03fd7a1
2020-01-22 19:24:24 -08:00
Benedict Wong
5642043367 Add Ikev2VpnProfile as public API
This change adds configuration classes for Platform VPNs, with the
extensibility for further platform VPNs to be added in future.

Profile validity is checked upon construction, and upon changing
conversion from VpnProfile instances. Internal storage and method calls
all use VpnProfiles to allow for reuse of existing infrastructure.
However, when Platform VPN implementations are started, the internal
VpnProfile will be converted back into the respective
PlatformVpnProfile for validity checking.

Bug: 143325939
Test: Compiles, FrameworksNetTests passing.
Change-Id: I3c375fb08c132fc062e893c375f5c36460122162
2020-01-22 19:23:01 -08:00
Benedict Wong
d439f790c3 Add additional fields to VpnProfile for profile-based IKEv2/IPsec VPNs
This commit adds the fields required to support IKEv2/IPsec VPNs. Other
fields will be reused where possible.

Bug: 143221465
Test: Compiles, new tests written for parcel/unparcel, encode/decode
Change-Id: I4c0e8fb934e75548424a15bbfb35c2ea9a3a57bc
2020-01-22 19:23:00 -08:00
Cody Kesting
d2e0f29a08 Merge changes from topic "connectivity-diagnostics-system-server"
am: 880e0654e7

Change-Id: I48a9f1f734b5e2dd4f7ed91c052cec5c8c62c076
2020-01-22 19:10:05 -08:00
Cody Kesting
880e0654e7 Merge changes from topic "connectivity-diagnostics-system-server"
* changes:
  Add ConnectivityDiagnosticsManager to System Server.
  Make DataStallReport Parcelable.
  Make ConnectivityReport Parcelable.
2020-01-23 01:56:33 +00:00
Automerger Merge Worker
f807f17797 Merge "Add API for CaptivePortalData" am: 1c42b174ed am: 12ad1433c1
Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0
2020-01-22 16:19:10 +00:00
Remi NGUYEN VAN
12ad1433c1 Merge "Add API for CaptivePortalData"
am: 1c42b174ed

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a
2020-01-22 08:05:11 -08:00
Remi NGUYEN VAN
1c42b174ed Merge "Add API for CaptivePortalData" 2020-01-22 15:55:17 +00:00
Automerger Merge Worker
93a1ccf499 Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 7c25b78583 am: 2cab87c895
Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8
2020-01-22 15:47:20 +00:00
Remi NGUYEN VAN
2cab87c895 Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 7c25b78583

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00
Treehugger Robot
7c25b78583 Merge "Add NetworkCapabilities#getSSID to SystemApi" 2020-01-22 15:23:07 +00:00
Remi NGUYEN VAN
ca455afb4d Add NetworkCapabilities#getSSID to SystemApi
setSSID was added to the API, so it makes sense to have getSSID be part
of the API as well.

Test: m
Bug: 139268426
Change-Id: I6fa9c513ce4fb8ce1e3530776ce8fd5b2e77055e
2020-01-22 22:52:53 +09:00
Remi NGUYEN VAN
0a65eeda32 Add API for CaptivePortalData
CaptivePortalData will be used to hold data advertised by the network
following RFC7710bis.

To fetch the CaptivePortalData, the API URL is added to LinkProperties,
to be provided by the NetworkAgent.

Because CaptivePortalData can be used to guess user location (especially
from the URLs provided by the portal), it is only exposed to
applications that have privileged permissions.

Test: atest FrameworksNetTests
Bug: 139269711
Change-Id: I341175b5fece8ee00e19898af5e8eabe66cefbf3
2020-01-22 22:27:44 +09:00
Automerger Merge Worker
c1c4793bd1 Merge changes from topic "networkagent" am: 239fb6480f am: 9b75818ff9
Change-Id: I4815caf8d3fb63f2b585b231b2d926e381b26010
2020-01-22 05:37:25 +00:00
Automerger Merge Worker
832b20610b Rename NetworkMisc to NetworkAgentConfig. am: ab2fed7241 am: 8e9c48d49b
Change-Id: I88bad8a6a119e3d137670653b7eeaf3cbc02aed8
2020-01-22 05:37:22 +00:00
Chiachang Wang
9b75818ff9 Merge changes from topic "networkagent"
am: 239fb6480f

Change-Id: Iaebb3aaced18257f4beffacc13a0d87efa1a7ec7
2020-01-21 21:32:52 -08:00
Lorenzo Colitti
8e9c48d49b Rename NetworkMisc to NetworkAgentConfig.
am: ab2fed7241

Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a
2020-01-21 21:32:30 -08:00
Chiachang Wang
239fb6480f Merge changes from topic "networkagent"
* changes:
  Add a Builder to NetworkAgentConfig, and make it SystemApi.
  Rename NetworkMisc to NetworkAgentConfig.
2020-01-22 05:27:51 +00:00
Automerger Merge Worker
e6e3a87c74 Merge "Make NetworkAgent stop subclassing Handler." am: f1449b0ba5 am: e348a88aeb
Change-Id: I87cc2d1dc8485ec628566f46e6283519ec970e10
2020-01-22 04:51:32 +00:00
Chiachang Wang
e348a88aeb Merge "Make NetworkAgent stop subclassing Handler."
am: f1449b0ba5

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6
2020-01-21 20:42:19 -08:00
Chiachang Wang
f1449b0ba5 Merge "Make NetworkAgent stop subclassing Handler." 2020-01-22 04:33:31 +00:00
Automerger Merge Worker
61a8c1bb44 Merge "Make NetworkCapabilities authoritative for roaming state" am: b32eec22b2 am: 5c6a0c74ff
Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8
2020-01-22 04:24:11 +00:00
Automerger Merge Worker
2cd8d1fcb3 Merge "Make NetworkCapabilities authoritative for suspended state" am: 445186aa82 am: a256726fcc
Change-Id: Ic83ca46fc7d0b849bb780c2977387356f8e2a461
2020-01-22 04:23:48 +00:00
Chiachang Wang
5c6a0c74ff Merge "Make NetworkCapabilities authoritative for roaming state"
am: b32eec22b2

Change-Id: I85043174796af8d37a390786e37993bd224a644a
2020-01-21 20:14:58 -08:00
Chiachang Wang
a256726fcc Merge "Make NetworkCapabilities authoritative for suspended state"
am: 445186aa82

Change-Id: I64db872c2b10972adc3feeb4121dbdf2753226e9
2020-01-21 20:09:36 -08:00
Chiachang Wang
b32eec22b2 Merge "Make NetworkCapabilities authoritative for roaming state" 2020-01-22 03:30:09 +00:00
Chiachang Wang
445186aa82 Merge "Make NetworkCapabilities authoritative for suspended state" 2020-01-22 03:29:42 +00:00
Cody Kesting
fa7693d4f9 Add ConnectivityDiagnosticsManager to System Server.
ConnectivityDiagnosticsManager should be accessed through
Context#getService. In order for this to be possible, it needs to be
defined as a service inside SystemServiceRegistry.

Bug: 146444622
Test: compiles.
Test: CTS testing in aosp/1211164
Change-Id: I6fe29441ecc9967a04ceb394b3bbe54830bef079
2020-01-21 08:31:56 -08:00
Automerger Merge Worker
8a9e6de8ad Merge "Add NetworkRequest#satisfiedBy to SystemApi" am: 2812b46691 am: 27d2bbc474
Change-Id: I737890e7e164728bae977db806a664c5d93c4fec
2020-01-21 14:34:49 +00:00
Remi NGUYEN VAN
27d2bbc474 Merge "Add NetworkRequest#satisfiedBy to SystemApi"
am: 2812b46691

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1
2020-01-21 06:21:11 -08:00
Remi NGUYEN VAN
2812b46691 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-21 14:12:27 +00:00
Lorenzo Colitti
8f304608c7 Add a Builder to NetworkAgentConfig, and make it SystemApi.
Currently, only support the three elements in the config that are
known to be used.

Bug: 138306002
Test: builds, boots
Test: atest FrameworksTelephonyTests
Change-Id: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
Merged-In: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
2020-01-21 13:12:15 +00:00
Lorenzo Colitti
ab2fed7241 Rename NetworkMisc to NetworkAgentConfig.
NetworkMisc is not really an appropriate name for a system API.

Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-21 12:57:27 +00:00
Lorenzo Colitti
cbd8f2a7a3 Make NetworkAgent stop subclassing Handler.
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.

Also fix some lint errors.

Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
Merged-In: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-21 12:55:29 +00:00
Automerger Merge Worker
30b76d89d1 Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: f414222461
Change-Id: I253587aca8cb272d0bf9576a84c5c7d5a0bb342a
2020-01-21 12:41:11 +00:00
Chalard Jean
f414222461 Merge changes I904d87c0,I9ef468a1
am: 85768e2dc3

Change-Id: I4edaf325eb0d18d9871bb3cda8005433e2e40132
2020-01-21 04:29:18 -08:00
Chalard Jean
62edfd8779 [NS A25] Send all listen callbacks after all rematches
Reupload of I2db9535b1d72edd46b968b1bae66b148aa815235 with a
bugfix.

Bug: 113554781
Test: ConnectivityServiceTests NetworkStackTests
Change-Id: I904d87c01d9422ba6233d22a189e8017dd298d37
2020-01-21 19:06:04 +09:00
Chalard Jean
9fc27eab94 [NS A24] Add an object to represent changes in assignment
Reupload of I703db6d3f039bd67a90fad0eadffc6cfed9a50ee

Test: ConnectivityServiceTest
Change-Id: I9ef468a17ebcfa684e5614b25dc06fc67eb71c79
2020-01-21 19:05:48 +09:00
Automerger Merge Worker
26c179cde1 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" am: 3b74d613e0 am: f45fcda616
Change-Id: Ib09d67da60524e5360b9587281c6fd5fbe6f7830
2020-01-21 07:18:03 +00:00
Remi NGUYEN VAN
f45fcda616 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
am: 3b74d613e0

Change-Id: I0207294af01a5cc9594f563398753370e3c7e011
2020-01-20 23:05:12 -08:00
Remi NGUYEN VAN
3b74d613e0 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" 2020-01-21 05:52:05 +00:00