Commit Graph

7801 Commits

Author SHA1 Message Date
Automerger Merge Worker
5511101bae Make TetheringManager to system API am: eeea0be5b7 am: 6ea097c34e
Change-Id: Iabb947b90eaaedbce30478e4294823acce085cdb
2020-01-24 16:49:41 +00:00
Automerger Merge Worker
6ea097c34e Make TetheringManager to system API am: eeea0be5b7
Change-Id: I9660401878cdbc2feedc7e950f4f02538ca070eb
2020-01-24 16:38:38 +00:00
markchien
eeea0be5b7 Make TetheringManager to system API
Also deprecated tethering APIs in ConnectivityManager.
Will have follow up change to remove @hide tethering function in
ConnectivityManager.

Bug: 145093446
Bug: 148038547
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ia432057bf9056727c4a0ca97d160a49274d33581
Merged-In: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-24 23:39:49 +09:00
Automerger Merge Worker
657f947261 Merge "Add list of Administrator UIDs to NetworkCapabilities." am: c3ce33eaa9 am: d2945fdcf7
Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737
2020-01-23 18:28:04 +00:00
Cody Kesting
d2945fdcf7 Merge "Add list of Administrator UIDs to NetworkCapabilities."
am: c3ce33eaa9

Change-Id: I7e5d0950ba99419d83fed6922a8f29aa530d4b00
2020-01-23 10:18:02 -08:00
Cody Kesting
c3ce33eaa9 Merge "Add list of Administrator UIDs to NetworkCapabilities." 2020-01-23 17:52:58 +00:00
Automerger Merge Worker
174004adec Merge "Define Bundle keys for ConnectivityDiagnostics." am: 0fd8b96249 am: 546778d792
Change-Id: Icbc4c95ebb4337d5c5b371e2fc7fc893e86cfe17
2020-01-23 17:05:21 +00:00
Nathan Harold
546778d792 Merge "Define Bundle keys for ConnectivityDiagnostics."
am: 0fd8b96249

Change-Id: I2a5ac28aea190d06dc2e7e6f8bb9950e0a18e3f7
2020-01-23 08:43:27 -08:00
Nathan Harold
0fd8b96249 Merge "Define Bundle keys for ConnectivityDiagnostics." 2020-01-23 16:34:16 +00:00
Cody Kesting
bfc074595d 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
fc16f69943 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
1421047edf Merge "Fix generic inferred type argument." am: ad1698053e am: 7d1b37fc4f
Change-Id: Ia4a304e8a62ca920cf51647ced2a1ea841c8dca2
2020-01-23 07:09:35 +00:00
Cody Kesting
7d1b37fc4f Merge "Fix generic inferred type argument."
am: ad1698053e

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84
2020-01-22 22:45:49 -08:00
Treehugger Robot
ad1698053e Merge "Fix generic inferred type argument." 2020-01-23 06:39:57 +00:00
Automerger Merge Worker
3b00ed1ca5 Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 1f3f2daefc
Change-Id: I91759cf3b68f89500352c6d952643a45e0665ee2
2020-01-23 06:18:15 +00:00
Benedict Wong
1f3f2daefc Merge changes from topic "add-ikev2-vpn-types"
am: adb79e3b39

Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e
2020-01-22 22:09:41 -08:00
Cody Kesting
27bf53f89c Fix generic inferred type argument.
Test: compiles.
Test: atest FrameworksNetTests
Change-Id: I0dffb3f44fb465ac8bae3c41f26176e86f65e825
2020-01-22 20:26:08 -08:00
Automerger Merge Worker
346f8902c2 Merge changes from topic "connectivity-diagnostics-system-server" am: fd47d34d34 am: 05bea2cbd5
Change-Id: Iae96f4e55ff74b48275b1559443ba982bb935bbc
2020-01-23 03:28:21 +00:00
Benedict Wong
ec7b665e6e 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
4416f38e4f 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
ab91804e53 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
05bea2cbd5 Merge changes from topic "connectivity-diagnostics-system-server"
am: fd47d34d34

Change-Id: I48a9f1f734b5e2dd4f7ed91c052cec5c8c62c076
2020-01-22 19:10:05 -08:00
Cody Kesting
fd47d34d34 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
1f1460e410 Merge "Add API for CaptivePortalData" am: 2af00b43b5 am: bfdbb07f60
Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0
2020-01-22 16:19:10 +00:00
Remi NGUYEN VAN
bfdbb07f60 Merge "Add API for CaptivePortalData"
am: 2af00b43b5

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a
2020-01-22 08:05:11 -08:00
Remi NGUYEN VAN
2af00b43b5 Merge "Add API for CaptivePortalData" 2020-01-22 15:55:17 +00:00
Automerger Merge Worker
b4da9b933d Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 026e45f305 am: ece6c2d06c
Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8
2020-01-22 15:47:20 +00:00
Remi NGUYEN VAN
ece6c2d06c Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 026e45f305

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00
Treehugger Robot
026e45f305 Merge "Add NetworkCapabilities#getSSID to SystemApi" 2020-01-22 15:23:07 +00:00
Remi NGUYEN VAN
97ef87510b 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
a36cf78761 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
0a0eaa7e82 Merge changes from topic "networkagent" am: 024e520f2d am: 4c14caf355
Change-Id: I4815caf8d3fb63f2b585b231b2d926e381b26010
2020-01-22 05:37:25 +00:00
Automerger Merge Worker
e9b063ef86 Rename NetworkMisc to NetworkAgentConfig. am: cf59536753 am: dbacfe4190
Change-Id: I88bad8a6a119e3d137670653b7eeaf3cbc02aed8
2020-01-22 05:37:22 +00:00
Chiachang Wang
4c14caf355 Merge changes from topic "networkagent"
am: 024e520f2d

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

Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a
2020-01-21 21:32:30 -08:00
Chiachang Wang
024e520f2d 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
83fc3dc0a2 Merge "Make NetworkAgent stop subclassing Handler." am: 54a2e5c268 am: 69e810b6e6
Change-Id: I87cc2d1dc8485ec628566f46e6283519ec970e10
2020-01-22 04:51:32 +00:00
Chiachang Wang
69e810b6e6 Merge "Make NetworkAgent stop subclassing Handler."
am: 54a2e5c268

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6
2020-01-21 20:42:19 -08:00
Chiachang Wang
54a2e5c268 Merge "Make NetworkAgent stop subclassing Handler." 2020-01-22 04:33:31 +00:00
Automerger Merge Worker
1caa00ea6b Merge "Make NetworkCapabilities authoritative for roaming state" am: cad1526c91 am: 1a4bc180d8
Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8
2020-01-22 04:24:11 +00:00
Automerger Merge Worker
dbdf6b65e1 Merge "Make NetworkCapabilities authoritative for suspended state" am: 4a6ab4c857 am: 08dc824058
Change-Id: Ic83ca46fc7d0b849bb780c2977387356f8e2a461
2020-01-22 04:23:48 +00:00
Chiachang Wang
1a4bc180d8 Merge "Make NetworkCapabilities authoritative for roaming state"
am: cad1526c91

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

Change-Id: I64db872c2b10972adc3feeb4121dbdf2753226e9
2020-01-21 20:09:36 -08:00
Chiachang Wang
cad1526c91 Merge "Make NetworkCapabilities authoritative for roaming state" 2020-01-22 03:30:09 +00:00
Chiachang Wang
4a6ab4c857 Merge "Make NetworkCapabilities authoritative for suspended state" 2020-01-22 03:29:42 +00:00
Cody Kesting
a5e2cef12e 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
98e6a7baeb Merge "Add NetworkRequest#satisfiedBy to SystemApi" am: 579d60d362 am: 6efabf584f
Change-Id: I737890e7e164728bae977db806a664c5d93c4fec
2020-01-21 14:34:49 +00:00
Remi NGUYEN VAN
6efabf584f Merge "Add NetworkRequest#satisfiedBy to SystemApi"
am: 579d60d362

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1
2020-01-21 06:21:11 -08:00
Remi NGUYEN VAN
579d60d362 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-21 14:12:27 +00:00
Lorenzo Colitti
8e5c76ea67 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