Commit Graph

5567 Commits

Author SHA1 Message Date
Lorenzo Colitti
6fb16a0ef0 Merge "Properly expect all callbacks in testStackedLinkProperties." am: 4129d435c1
am: 6d8a63cf80

Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
6d8a63cf80 Merge "Properly expect all callbacks in testStackedLinkProperties."
am: 4129d435c1

Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e
2019-01-21 22:41:16 -08:00
Lorenzo Colitti
4129d435c1 Merge "Properly expect all callbacks in testStackedLinkProperties." 2019-01-22 06:31:23 +00:00
Remi NGUYEN VAN
c90d59e401 Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d
am: b78f2a5d68

Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
b78f2a5d68 Merge "Add NetworkMonitor constants to SystemApi"
am: 591de4579d

Change-Id: Ic9591f31c6f2b7e613a78fa32311412952be26b8
2019-01-21 19:15:59 -08:00
Remi NGUYEN VAN
591de4579d Merge "Add NetworkMonitor constants to SystemApi" 2019-01-22 03:03:37 +00:00
Lorenzo Colitti
46eae8a765 Properly expect all callbacks in testStackedLinkProperties.
Currently testStackedLinkProperties accounts for some of the
NetworkCallbacks that are fired, but not all of them. The test
passes because it only ever expects LinkProperties changed
callbacks (and not, e.g., lost callbacks), because it uses
waitForIdle(), and because at the end, when the callback is
unregistered, it does not call assertNoCallback().

Add the missing callback expectation and expect a LOST callback
at the end. Also add an assertNoCallback, even though it's not
strictly necessary. Remove all the waitForIdle statements, which
are no longer necessary because every assertion happens after
waiting for a callback.

Making the expectations more precise in a separate CL will help
ensure that upcoming changes to this code don't break anything,
and will make said changes easier to review.

Bug: 65674744
Test: atest FrameworksNetTests
Test: ConnectivityServiceTest#testStackedLinkProperties passes 400 times
Change-Id: I73cda0dd029a0e6546f7272beedf841ce5a4c0dc
2019-01-22 10:53:00 +09:00
Remi NGUYEN VAN
22ce4c1af7 Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b
am: 81bbdbb10f

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
81bbdbb10f Merge "Add fields used by NetworkStack to the API"
am: ca2d2c268b

Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd
2019-01-21 15:36:17 -08:00
Remi NGUYEN VAN
ca2d2c268b Merge "Add fields used by NetworkStack to the API" 2019-01-21 23:20:26 +00:00
Chalard Jean
c8a38238fe Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a
am: 11c58491ff

Change-Id: I552730badc910df5f5a48c2ded6566071b604783
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
10b0b4e128 Merge "Add stable AIDL parcelables for IIpClient API" am: df5f539427
am: 2ec1342261

Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08:00
Chalard Jean
11c58491ff Merge changes I2ddfef0c,I49bee0c9
am: ba4d5be35a

Change-Id: I54b43a6fe240d00d0e530a8777bdb9f452a2b539
2019-01-21 11:01:47 -08:00
Remi NGUYEN VAN
2ec1342261 Merge "Add stable AIDL parcelables for IIpClient API"
am: df5f539427

Change-Id: Id3e39ed932161941f953c2f38d1ce9ed0afcc785
2019-01-21 10:56:19 -08:00
Remi NGUYEN VAN
5af2e292e1 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
e541d1811b 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
Merged-In: I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5
Change-Id: I4879568d3fbf9435767c8d4d0ab5198d421a2f4f
2019-01-21 21:11:15 +09:00
Junyu Lai
24e6f543f5 Merge "Remove dead KeepaliveInfo if it cannot be started" am: 6360a83b6c
am: ba5be38fac

Change-Id: I61f441237fcaadc5abc5592e7a63e4d35282def5
2019-01-21 02:52:21 -08:00
Chalard Jean
ba4d5be35a 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
df5f539427 Merge "Add stable AIDL parcelables for IIpClient API" 2019-01-21 08:01:26 +00:00
Chalard Jean
d92c3d5c95 [MS08] Read back attributes and blobs.
Test: New tests in IpMemoryStore
Bug: 113554482

Change-Id: I2ddfef0c2ed37459c038f75d1dfc92fdefbf58f5
2019-01-21 15:21:09 +09:00
Junyu Lai
ba5be38fac Merge "Remove dead KeepaliveInfo if it cannot be started"
am: 6360a83b6c

Change-Id: I7ec41627065d21d025370905257483738ee04c42
2019-01-20 20:09:51 -08:00
Remi NGUYEN VAN
297c2d6086 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
Junyu Lai
6360a83b6c Merge "Remove dead KeepaliveInfo if it cannot be started" 2019-01-21 03:48:15 +00:00
Josh Gao
97e14189cd Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 79a632905b
am: 49ccab2d41

Change-Id: I928a47f677cc882ee816b6fa8afb41ead2729466
2019-01-18 15:27:33 -08:00
Josh Gao
49ccab2d41 Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."
am: 79a632905b

Change-Id: Ib8c818a3038877b87187659b0ff65a9d31b998e7
2019-01-18 14:55:47 -08:00
Josh Gao
79a632905b Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." 2019-01-18 22:25:35 +00:00
junyulai
c0499c5b6d Remove dead KeepaliveInfo if it cannot be started
If KeepaliveInfo was created but cannot be started, current
design will only notify apps but not remove it from local
hashmap, which will cause unexpected behavior if someone
tries to iterate records and fire callbacks.

Bug: 122636283
Test: atest FrameworksNetTests
Change-Id: If4cb25a881dd3555f569c729f88741675f7f3bdf
2019-01-18 21:48:13 +08:00
Etan Cohen
8452d2156d Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5
am: 9e15373de2

Change-Id: I64f17aebbfe1820b42aa33b487b17e65ba734ab3
2019-01-17 21:24:03 -08:00
Etan Cohen
9e15373de2 Merge "[CS] Add an option to block sensitive network specifier"
am: 895ef965f5

Change-Id: Idedbc2ec564bd1ab65a3bb466ea4f20bb849648f
2019-01-17 21:14:54 -08:00
Etan Cohen
c069b066d3 [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
Lorenzo Colitti
21bf610980 Merge changes Iec53a9fd,Iac4cfe70 am: ab07d23ac3
am: 0032ba7e00

Change-Id: I56af4e9a82f66e507d2360822af27a39e0fcb238
2019-01-16 01:51:38 -08:00
Lorenzo Colitti
0032ba7e00 Merge changes Iec53a9fd,Iac4cfe70
am: ab07d23ac3

Change-Id: I8fae2c4d23d6e904b473b1e906094f997c8e446c
2019-01-16 01:42:42 -08:00
Lorenzo Colitti
ab07d23ac3 Merge changes Iec53a9fd,Iac4cfe70
* changes:
  Test parceling empty LinkProperties.
  Delete the clatd functions from NetworkManagementService.
2019-01-16 09:28:06 +00:00
Remi NGUYEN VAN
401a478678 Merge "Add Nat64Prefix to LinkProperties copy constructor" am: 202d9f1837
am: ae8a5f9ec3

Change-Id: I793230bd65e24c5976849e860defa159cf22507b
2019-01-16 00:57:04 -08:00
Remi NGUYEN VAN
ae8a5f9ec3 Merge "Add Nat64Prefix to LinkProperties copy constructor"
am: 202d9f1837

Change-Id: If0b47f74b9ac1016ab7e72574745e12e525e2555
2019-01-16 00:47:45 -08:00
Remi NGUYEN VAN
202d9f1837 Merge "Add Nat64Prefix to LinkProperties copy constructor" 2019-01-16 08:35:01 +00:00
Remi NGUYEN VAN
0dd72a25de 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
Lorenzo Colitti
2a7ddd7017 Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a
am: 64b4c729b9

Change-Id: I808042e00cbc1da8d3e878add9b643a75968919e
2019-01-14 20:29:10 -08:00
Lorenzo Colitti
64b4c729b9 Merge "Add the NAT64 prefix to LinkProperties."
am: 983e77db4a

Change-Id: Ia1e6e1e584db12e57b245fa01651d289337906a3
2019-01-14 20:17:53 -08:00
Lorenzo Colitti
1098cc6470 Test parceling empty LinkProperties.
Test: atest FrameworksNetTests
Change-Id: Iec53a9fdce1ba1db86751ea5f14a11d28be543eb
2019-01-15 12:53:59 +09:00
Lorenzo Colitti
c9ac786a08 Delete the clatd functions from NetworkManagementService.
Make Nat464Xlat talk to netd directly instead of through
NetworkManagementService. The methods in NetworkmanagementService
don't really provide any value: since the only thing they do is
call into netd, we might as well have the callers talk to netd
directly,

In order to do this, pass INetworkManagementService and INetd to
the NetworkAgentInfo constructor, and update callers appropriately.

Bug: 65674744
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: Iac4cfe709c6279e4d9682b6754963e533707bd12
2019-01-15 11:13:07 +09:00
Lorenzo Colitti
3d680287a3 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
4e9b83ed6d Merge changes from topic "IPMS1" am: 3627deac88
am: 6659e77d0f

Change-Id: I2541996b9bfe338acabac858fdea0ad89d55df5b
2019-01-11 03:53:57 -08:00
Chalard Jean
6659e77d0f Merge changes from topic "IPMS1"
am: 3627deac88

Change-Id: I80fc9437a041de68ce16ae5e85189b5d48fe1c97
2019-01-11 03:44:45 -08:00
Chalard Jean
709d367b80 [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
7c2ee0d699 [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
77a7561f5d Merge "Move NetworkMonitor to NetworkStack" am: 197460b8d5
am: 6cd05b8739

Change-Id: I438b95e135d0d86be53ea3a8ab61105a886e2a2e
2019-01-10 21:29:38 -08:00
Remi NGUYEN VAN
6cd05b8739 Merge "Move NetworkMonitor to NetworkStack"
am: 197460b8d5

Change-Id: If5c2c104bc53a565e89e625b1edce0b976a295f3
2019-01-10 21:15:28 -08:00
Remi NGUYEN VAN
197460b8d5 Merge "Move NetworkMonitor to NetworkStack" 2019-01-11 05:08:52 +00:00
Remi NGUYEN VAN
1becbe7015 Move NetworkMonitor to NetworkStack
Bug: b/112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
2019-01-11 09:59:11 +09:00