Commit Graph

3866 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
b0d60c4cf8 Merge "Add NetworkMonitor constants to SystemApi" 2019-01-22 01:46:12 +00:00
Remi NGUYEN VAN
4603a03993 Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3 am: e89f53330a
am: a359fc3948

Change-Id: Icbbbd2c5db729210735c0bcb415b9c4025d852e0
2019-01-21 17:41:49 -08:00
Remi NGUYEN VAN
a359fc3948 Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3
am: e89f53330a

Change-Id: I58d8725a1f43f42d364a53ca80d86e3f65e6cf63
2019-01-21 17:32:12 -08:00
Remi NGUYEN VAN
60b9ad2ec3 Merge "Add IIpClient API for IpClient" 2019-01-22 01:10:17 +00:00
Remi NGUYEN VAN
ce476415ac Merge changes I5a6174a4,Idfbfdf54 am: 33a04d0ff9 am: 8898e7c094
am: 6134d99bce

Change-Id: I5e5c3d34e2eb672cb53b374609cbe6ca6ca9b98d
2019-01-21 16:11:12 -08:00
Remi NGUYEN VAN
6c5b1ff4ad Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c am: 4bf93bb9c4
am: c4c5079a09

Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33
2019-01-21 15:57:53 -08:00
Remi NGUYEN VAN
6134d99bce Merge changes I5a6174a4,Idfbfdf54 am: 33a04d0ff9
am: 8898e7c094

Change-Id: Ibbbf2445fa4094733227f4ece643160fb7ca7c46
2019-01-21 15:56:22 -08:00
Remi NGUYEN VAN
c4c5079a09 Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c
am: 4bf93bb9c4

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
33a04d0ff9 Merge changes I5a6174a4,Idfbfdf54
* changes:
  Acquire lock to write NetworkStackConnector
  Allow Bluetooth to bind to NetworkStack
2019-01-21 23:31:07 +00:00
Remi NGUYEN VAN
79a6d5e30c Merge "Add fields used by NetworkStack to the API" 2019-01-21 23:20:26 +00:00
Chalard Jean
75437d2310 Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b am: a6109ea3a0
am: 39f2eb4abd

Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69
2019-01-21 11:28:55 -08:00
Remi NGUYEN VAN
96892aae33 Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97 am: 4294a0f939
am: bba39913f8

Change-Id: Ieac619f043a7142cbbec3eaec334b7fac97ce7fc
2019-01-21 11:19:54 -08:00
Chalard Jean
39f2eb4abd Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b
am: a6109ea3a0

Change-Id: I552730badc910df5f5a48c2ded6566071b604783
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
bba39913f8 Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97
am: 4294a0f939

Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08:00
Remi NGUYEN VAN
800e843862 Acquire lock to write NetworkStackConnector
As Java reference writes are atomic, the previous code should not have
issues, but since mConnector is marked @GuardedBy it could trigger
static analysis.

Test: m
Change-Id: I5a6174a4f32c349e593d0a16d58293d608a487c7
2019-01-21 23:21:40 +09:00
Remi NGUYEN VAN
31f1d0cd8d Add fields used by NetworkStack to the API
Test: m
Bug: 112869080
Change-Id: I59f6d5ae8a601b7496548b87f137a577f2365a37
2019-01-21 23:03:25 +09:00
Remi NGUYEN VAN
d0a933476c Add NetworkMonitor constants to SystemApi
NetworkMonitor lives in the NetworkStack which must only use system
APIs. This includes constants used by NetworkMonitor and captive portal
login.

Bug: 112869080
Test: m
(Cherry-pick of aosp I4879568d3fbf9435767c8d4d0ab5198d421a2f4f)

Change-Id: I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5
2019-01-21 21:07:10 +09:00
Chalard Jean
ca046e898b Merge changes I2ddfef0c,I49bee0c9
* changes:
  [MS08] Read back attributes and blobs.
  [MS07] Implement storeNetworkAttributes and storeBlob.
2019-01-21 09:34:41 +00:00
Remi NGUYEN VAN
a5d31f53b6 Add IIpClient API for IpClient
The API will be used to interact with IpClient once it is moved to the
NetworkStack process.
This change keeps compatibility with the previous API so that clients
can be migrated independently.

Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I57d8164afae849230bbc0e25f17859c0b22d0f29
2019-01-21 18:25:46 +09:00
Remi NGUYEN VAN
69b967f5d0 Allow Bluetooth to bind to NetworkStack
Test: flashed, verified bluetooth tethering gets IP address
Bug: b/112869080
Change-Id: Idfbfdf54754fea46eb0099b9b9a3bdc29dd241e0
2019-01-21 18:25:01 +09:00
Chalard Jean
91549b6d1b [MS07] Implement storeNetworkAttributes and storeBlob.
Test: New tests in IpMemoryStore
Bug: 113554482

Change-Id: I49bee0c903247e77ab93517efbe44548313cf1a4
2019-01-21 15:21:09 +09:00
Remi NGUYEN VAN
6b0b2b735e Add stable AIDL parcelables for IIpClient API
Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: Ia4ac1eb482850a06c4dc1b6c1fe55d33d4087388
2019-01-21 12:54:24 +09:00
Etan Cohen
8945e2e33c Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5 am: 787525e951
am: 82083c8a15

Change-Id: I17fba0e9c0314b32597ccdc1ac6de61ca796e9b8
2019-01-17 21:33:27 -08:00
Etan Cohen
82083c8a15 Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5
am: 787525e951

Change-Id: I64f17aebbfe1820b42aa33b487b17e65ba734ab3
2019-01-17 21:24:03 -08:00
Etan Cohen
836ad571eb [CS] Add an option to block sensitive network specifier
Network specifiers are used for 2 purposes:

- As part of network requests to specify more information on the type
  of requested networks.
- On network agents to specify information about their networks.

The network specifiers of the requests and agents are matched to each
other. However, the agent network specifier may contain sensitive
information which we do not want forwarded to any app.

This CL adds an option to strip out this agent network specifier before
the network capabilities are forwarded to the app.

Bug: 122160111
Test: atest ConnectivityServiceTest (frameworks/base/tests/net)
Test: atest frameworks/base/tests/net
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks/opt/net/ethernet/tests
Test: atest android.net.cts - some flakiness!
Test: act.py ThroughputTest
Test: act.py DataPathTest
Test: atest SingleDeviceTest (cts)
Change-Id: If08d312ff814bdde1147518f923199e6349503d5
2019-01-17 16:30:05 -08:00
Remi NGUYEN VAN
e9ffc74145 Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6 am: e45592f5fd
am: 15f85cd5f2

Change-Id: I81b1d0405d144dc8b053c6f3961a5542de4dd0ec
2019-01-17 01:06:47 -08:00
Remi NGUYEN VAN
15f85cd5f2 Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6
am: e45592f5fd

Change-Id: I301f9ccac2008c102dbc5e14e3654cf268e20d1d
2019-01-17 00:55:38 -08:00
Remi NGUYEN VAN
c37177a7d6 Merge "Add stable AIDL parcelables for LinkProperties" 2019-01-17 08:30:18 +00:00
Remi NGUYEN VAN
4855a2e2c6 Add stable AIDL parcelables for LinkProperties
Test: atest android.net.shared.LinkPropertiesParcelableUtilTest
Bug: b/112869080
Change-Id: I2b69980e25bae9f51fb5b8cd3cafb403e6bd53da
2019-01-17 13:11:12 +09:00
Chalard Jean
abf3769f79 Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f am: 796c9446f7 am: 18e166a11b
am: 87d8e82e20

Change-Id: If096c80bc287402ff3b35a0a1bb12dbf65efdda0
2019-01-16 04:53:42 -08:00
Chalard Jean
87d8e82e20 Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f am: 796c9446f7
am: 18e166a11b

Change-Id: I174716764b2d6e441547d4fbad4043cdbf0f8ad9
2019-01-16 04:42:18 -08:00
Chalard Jean
796c9446f7 Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f
* changes:
  [MS06] Add the relevance utils.
  [MS05] Pretty print the data classes of IPMS.
  [MS04] Add an executor to the memory store.
  [MS03] Add the contract for the IPMS database.
2019-01-16 12:14:46 +00:00
Remi NGUYEN VAN
a7943e2578 Merge "Add Nat64Prefix to LinkProperties copy constructor" am: d1df42bbb9 am: 7817393ef9
am: 7609eb5667

Change-Id: I79e600d35770710f07adc55e9a7c55eb7c0f5ff1
2019-01-16 01:06:17 -08:00
Remi NGUYEN VAN
7609eb5667 Merge "Add Nat64Prefix to LinkProperties copy constructor" am: d1df42bbb9
am: 7817393ef9

Change-Id: I793230bd65e24c5976849e860defa159cf22507b
2019-01-16 00:57:04 -08:00
Remi NGUYEN VAN
b68c3499c1 Add Nat64Prefix to LinkProperties copy constructor
The attribute is copied when parceling/unparceling so should also be
preserved in the copy constructor.

Test: tests based on this pass
Change-Id: Ia48d94fc075e6414f537dad181a236be5a32b41b
2019-01-16 15:27:27 +09:00
Chalard Jean
8fe503f192 [MS05] Pretty print the data classes of IPMS.
Test: A commando of monkeys has been dispatched to make sure
      this pretty-printing is very, very pretty.
      Also one human has made sure of this by printing instances
      to the log.
Bug: 116512211

Change-Id: I7df77a997a982a0b3d444502cc69de5544f70736
2019-01-15 14:16:07 +09:00
Chalard Jean
61e27abf28 [MS03] Add the contract for the IPMS database.
Test: Some more boilerplate that doesn't exactly need tests as such.
      The important thing is that the database can store and retrieve
      data, not that it creates as specific file or schema.
Bug: 116512211

Change-Id: Ic27e706f15754b34d7bc26626a92d895a15a083d
2019-01-15 14:12:39 +09:00
Lorenzo Colitti
00b6b09fb5 Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a am: a63453bf68
am: 756b260800

Change-Id: I53948d2c3f50b9973e5b9483cf172b5932028f51
2019-01-14 20:40:25 -08:00
Lorenzo Colitti
756b260800 Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a
am: a63453bf68

Change-Id: I808042e00cbc1da8d3e878add9b643a75968919e
2019-01-14 20:29:10 -08:00
Lorenzo Colitti
59b34472c9 Add the NAT64 prefix to LinkProperties.
Currently we support exactly one NAT64 prefix. This matches what
other components in the system (Dns64Configuration, clatd, etc.)
support.

Test: atest FrameworksNetTests
Change-Id: I45a11cebe43a5e1c60d50eca7889cb317565b598
2019-01-12 02:16:34 +09:00
Chalard Jean
fc758be231 Merge changes from topic "IPMS1" am: 3627deac88 am: 54d91e605c
am: 2304c7c508

Change-Id: I6908f68b1b9e7079384c4cc9f11c4e46cce694ce
2019-01-11 04:13:38 -08:00
Chalard Jean
2304c7c508 Merge changes from topic "IPMS1" am: 3627deac88
am: 54d91e605c

Change-Id: I2541996b9bfe338acabac858fdea0ad89d55df5b
2019-01-11 03:53:57 -08:00
Chalard Jean
f89d7bee9e [MS02] Write the skeleton for the IP memory store.
This implements a minimal contract for the IP Memory Store
feature.

Test: Created new tests for parcelable code. For the rest, created
      empty tests, but there is no logic, it's boilerplate day
Bug: 116512211
Change-Id: I15dc6275b370d671385ddfdb058a8b8d39952d6e
2019-01-11 15:01:00 +09:00
Chalard Jean
8c141bdb8f [MS01] Add the IP memory store service.
Bug: 116512211
Test: Added initial tests
Change-Id: I9d9af4097e3e2d7afd9956b9cbfa29a9f9558ae0
2019-01-11 15:00:36 +09:00
Remi NGUYEN VAN
7e425036a6 Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a am: 8ecc6c9e32
am: 935a491a59

Change-Id: Ia5d742bd5186e92b8a45bb72fb414b9dbdd38f78
2019-01-10 21:39:06 -08:00
Remi NGUYEN VAN
935a491a59 Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a
am: 8ecc6c9e32

Change-Id: I438b95e135d0d86be53ea3a8ab61105a886e2a2e
2019-01-10 21:29:38 -08:00
Remi NGUYEN VAN
81552d610a Merge "Move NetworkMonitor to NetworkStack" 2019-01-11 05:08:52 +00:00
Remi NGUYEN VAN
e67b0c3aee Move NetworkMonitor to NetworkStack
Bug: b/112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
2019-01-11 09:59:11 +09:00
Chalard Jean
036da579e2 Merge "Add PCSCF to LinkProperties." am: 64e495b274 am: 40c9e752ac
am: e2bbcc1837

Change-Id: I16eedc51ad4932b7ec6a32d9e718c48cf203c2f0
2019-01-09 22:29:15 -08:00
Chalard Jean
e2bbcc1837 Merge "Add PCSCF to LinkProperties." am: 64e495b274
am: 40c9e752ac

Change-Id: I491e99f7225233d5841b61ce383325e7a1c43fa0
2019-01-09 22:19:14 -08:00