Commit graph

7,783 commits

Message SHA1
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9
Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78

Automerger Merge Worker   commited 2020-01-24 16:39:47 +00:00
346cc58d29
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: 54600d7b00
Change-Id: I1d60026a7b31af2bc329187685780744c20d7c8c

Automerger Merge Worker   commited 2020-01-24 16:39:32 +00:00
f94fb42850
Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58
Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8

Automerger Merge Worker   commited 2020-01-24 16:38:56 +00:00
14ea3431d0
Allows the caller to specify configuration by TetheringRequest am: 91c78e57df
Change-Id: I2595221b08eb389dcbe8643f3839707a15bc6ac0

Automerger Merge Worker   commited 2020-01-24 16:38:45 +00:00
a64e1cce4e
Make TetheringManager to system API am: 6ae63e5232
Change-Id: I9660401878cdbc2feedc7e950f4f02538ca070eb

Automerger Merge Worker   commited 2020-01-24 16:38:38 +00:00
5ea28ce6d3
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-01-24 16:38:22 +00:00
680cce79b9
Merge "Define ConnectivityDiagnosticsCallback IBinder impl."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-01-24 16:38:08 +00:00
54600d7b00
Merge changes I7065d081,Ic7c3a331,Ia432057b
* changes:
  Add API for tethering clients change
  Allows the caller to specify configuration by TetheringRequest
  Make TetheringManager to system API

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2020-01-24 16:23:18 +00:00
6a0bafdb58
Allows the caller to specify configuration by TetheringRequest
This is initial work to allow caller to pass their prefered
configuration to start tethering. Caller may able to specify the
downstream interface ipv4 address with dhcp server disabled for
static IP configuration, or able to exempt entitlement check if
they have permission in follow up CL.

Bug: 141256482
Test: -atest TetheringTest
      -ON/OFF wifi tethering

Change-Id: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
Merged-In: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3

markchien   authored and   Lorenzo Colitti   commited 2020-01-24 23:39:50 +09:00
91c78e57df
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

markchien   authored and   Lorenzo Colitti   commited 2020-01-24 23:39:49 +09:00
6ae63e5232
Add AIDL for registering ConnectivityDiagnosticCallbacks.
ConnectivityService needs to allow for registering and unregistering
ConnectivityDiagnosticsCallbacks as part of ConnectivityDiagnostics API.
These methods will be used by ConnectivityDiagnosticsManager so that
privileged applications can receive notifications on network events by
the system.

Bug: 146444622
Test: compiles
Change-Id: Id00b30af5692db5eef47d0d948897148578d3b32

Cody Kesting   commited 2020-01-23 11:30:04 -08:00
d199a9db39
Define ConnectivityDiagnosticsCallback IBinder impl.
An IBinder implementation of the ConnectivityDiagnosticsCallback AIDL is
needed so that apps can receive notfications with their registered
callbacks for callbacks coming from ConnectivityService.

Bug: 143187964
Bug: 147848028
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Ie62678f794d81e1edee68977ec684a911b5070b7

Cody Kesting   commited 2020-01-23 11:30:04 -08:00
3e7fb38355
Merge "Add list of Administrator UIDs to NetworkCapabilities."
am: 452ccae317

Change-Id: I7e5d0950ba99419d83fed6922a8f29aa530d4b00

Cody Kesting   authored and   android-build-merger   commited 2020-01-23 10:18:02 -08:00
347f56c836
Merge "Add list of Administrator UIDs to NetworkCapabilities."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-01-23 17:52:58 +00:00
452ccae317
Merge "Define Bundle keys for ConnectivityDiagnostics."
am: eedaa1f471

Change-Id: I2a5ac28aea190d06dc2e7e6f8bb9950e0a18e3f7

Nathan Harold   authored and   android-build-merger   commited 2020-01-23 08:43:27 -08:00
e049dc0e3d
Merge "Define Bundle keys for ConnectivityDiagnostics."
Nathan Harold   authored and   Gerrit Code Review   commited 2020-01-23 16:34:16 +00:00
eedaa1f471
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

Cody Kesting   authored and   Nathan Harold   commited 2020-01-23 00:49:17 -08:00
d6ad3365fa
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

Cody Kesting   commited 2020-01-22 23:59:56 -08:00
896939854b
Merge "Fix generic inferred type argument."
am: 7e5cce2c67

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84

Cody Kesting   authored and   android-build-merger   commited 2020-01-22 22:45:49 -08:00
e3acc01753
Merge "Fix generic inferred type argument."
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-23 06:39:57 +00:00
7e5cce2c67
Merge changes from topic "add-ikev2-vpn-types"
am: adb79e3b39

Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e

Benedict Wong   authored and   android-build-merger   commited 2020-01-22 22:09:41 -08:00
6e1557d8ca
Fix generic inferred type argument.
Test: compiles.
Test: atest FrameworksNetTests
Change-Id: I0dffb3f44fb465ac8bae3c41f26176e86f65e825

Cody Kesting   commited 2020-01-22 20:26:08 -08:00
ec88fda4a8
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

Benedict Wong   commited 2020-01-22 19:24:24 -08:00
80240acd3f
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

Benedict Wong   commited 2020-01-22 19:23:01 -08:00
5642043367
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

Benedict Wong   commited 2020-01-22 19:23:00 -08:00
d439f790c3
Merge changes from topic "connectivity-diagnostics-system-server"
am: 880e0654e7

Change-Id: I48a9f1f734b5e2dd4f7ed91c052cec5c8c62c076

Cody Kesting   authored and   android-build-merger   commited 2020-01-22 19:10:05 -08:00
d2e0f29a08
Merge changes from topic "connectivity-diagnostics-system-server"
* changes:
  Add ConnectivityDiagnosticsManager to System Server.
  Make DataStallReport Parcelable.
  Make ConnectivityReport Parcelable.

Cody Kesting   authored and   Gerrit Code Review   commited 2020-01-23 01:56:33 +00:00
880e0654e7
Merge "Add API for CaptivePortalData"
am: 1c42b174ed

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a

Remi NGUYEN VAN   authored and   android-build-merger   commited 2020-01-22 08:05:11 -08:00
12ad1433c1
Merge "Add API for CaptivePortalData"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 15:55:17 +00:00
1c42b174ed
Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 7c25b78583

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236

Remi NGUYEN VAN   authored and   android-build-merger   commited 2020-01-22 07:30:49 -08:00
2cab87c895
Merge "Add NetworkCapabilities#getSSID to SystemApi"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-22 15:23:07 +00:00
7c25b78583
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

Remi NGUYEN VAN   commited 2020-01-22 22:52:53 +09:00
ca455afb4d
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

Remi NGUYEN VAN   commited 2020-01-22 22:27:44 +09:00
0a65eeda32
Merge changes from topic "networkagent"
am: 239fb6480f

Change-Id: Iaebb3aaced18257f4beffacc13a0d87efa1a7ec7

Chiachang Wang   authored and   android-build-merger   commited 2020-01-21 21:32:52 -08:00
9b75818ff9
Rename NetworkMisc to NetworkAgentConfig.
am: ab2fed7241

Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a

Lorenzo Colitti   authored and   android-build-merger   commited 2020-01-21 21:32:30 -08:00
8e9c48d49b
Merge changes from topic "networkagent"
* changes:
  Add a Builder to NetworkAgentConfig, and make it SystemApi.
  Rename NetworkMisc to NetworkAgentConfig.

Chiachang Wang   authored and   Gerrit Code Review   commited 2020-01-22 05:27:51 +00:00
239fb6480f
Merge "Make NetworkAgent stop subclassing Handler."
am: f1449b0ba5

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6

Chiachang Wang   authored and   android-build-merger   commited 2020-01-21 20:42:19 -08:00
e348a88aeb
Merge "Make NetworkAgent stop subclassing Handler."
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-01-22 04:33:31 +00:00
f1449b0ba5
Merge "Make NetworkCapabilities authoritative for roaming state"
am: b32eec22b2

Change-Id: I85043174796af8d37a390786e37993bd224a644a

Chiachang Wang   authored and   android-build-merger   commited 2020-01-21 20:14:58 -08:00
5c6a0c74ff
Merge "Make NetworkCapabilities authoritative for suspended state"
am: 445186aa82

Change-Id: I64db872c2b10972adc3feeb4121dbdf2753226e9

Chiachang Wang   authored and   android-build-merger   commited 2020-01-21 20:09:36 -08:00
a256726fcc
Merge "Make NetworkCapabilities authoritative for roaming state"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-01-22 03:30:09 +00:00
b32eec22b2
Merge "Make NetworkCapabilities authoritative for suspended state"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-01-22 03:29:42 +00:00
445186aa82
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

Cody Kesting   commited 2020-01-21 08:31:56 -08:00
fa7693d4f9
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
am: 2812b46691

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1

Remi NGUYEN VAN   authored and   android-build-merger   commited 2020-01-21 06:21:11 -08:00
27d2bbc474
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-21 14:12:27 +00:00
2812b46691
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

Lorenzo Colitti   authored and   Chiachang Wang   commited 2020-01-21 13:12:15 +00:00
8f304608c7
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

Lorenzo Colitti   authored and   Chiachang Wang   commited 2020-01-21 12:57:27 +00:00
ab2fed7241
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

Lorenzo Colitti   authored and   Chiachang Wang   commited 2020-01-21 12:55:29 +00:00
cbd8f2a7a3
Merge changes I904d87c0,I9ef468a1
am: 85768e2dc3

Change-Id: I4edaf325eb0d18d9871bb3cda8005433e2e40132

Chalard Jean   authored and   android-build-merger   commited 2020-01-21 04:29:18 -08:00
f414222461
[NS A25] Send all listen callbacks after all rematches
Reupload of I2db9535b1d72edd46b968b1bae66b148aa815235 with a
bugfix.

Bug: 113554781
Test: ConnectivityServiceTests NetworkStackTests
Change-Id: I904d87c01d9422ba6233d22a189e8017dd298d37

Chalard Jean   commited 2020-01-21 19:06:04 +09:00
62edfd8779