Commit graph android_packages_modules_Co.../tests/net/java/android
Message SHA1
Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 6e55aca3fa am: 90cad47708
am: aa12af640b

Change-Id: I700550160c795becb4c3e37a88328488846d272f

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:47:49 -08:00
cd6d2a46eb
Merge "[KA03] Support tcp keepalive offload" am: 5f8ddc2eb1 am: 0b93464e32
am: d6cedf5ed3

Change-Id: I55d7b285a75946713986163fbaa166d4b02513d4

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 22:41:37 -08:00
a627caa478
[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I057dde79013b9eda5037b9a44f8eee06cc07352e

junyulai   authored and   Chalard Jean   commited 2019-02-06 14:07:39 +09:00
80d0356311
[KA03] Support tcp keepalive offload
When offload is starting, socket will be switched to repair
mode. Read and write on the socket will not be allowed until
repair mode is turned off. If remote packet arrives, repair
mode will be turned off automatically and a callback will
be raised to indicate that socket is ready to read from.

Bug: 114151147
Test: -atest FrameworksNetTests
      -manual

Change-Id: I0c335865912e183e7ad32a8ea12188f02ccde5fd

markchien   authored and   Chalard Jean   commited 2019-02-06 12:22:22 +09:00
e5591ce2fa
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-28 09:06:20 +00:00
8f8deae60f
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-28 06:57:25 +00:00
b19997dbe9
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
(Cherry-pick of aosp/881952)
Change-Id: Ie20dcee375b377236004a7689890729493aca857

Remi NGUYEN VAN   commited 2019-01-28 13:45:46 +09:00
98d9df7a9b
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab

Remi NGUYEN VAN   commited 2019-01-28 13:45:17 +09:00
e167e117c1
Add NetworkStack networking deps to SystemApi
Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug: 112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9

Remi NGUYEN VAN   commited 2019-01-28 13:28:35 +09:00
8bd18cff9a
Add NetworkStack networking deps to SystemApi
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce

Remi NGUYEN VAN   commited 2019-01-25 09:05:58 +09:00
b432c2c45c
Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a am: ae62bfc346
am: 16e7e25468

Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69

Chalard Jean   authored and   android-build-merger   commited 2019-01-21 11:28:55 -08:00
999ca436ed
[MS08] Read back attributes and blobs.
Test: New tests in IpMemoryStore
Bug: 113554482

Change-Id: I2ddfef0c2ed37459c038f75d1dfc92fdefbf58f5

Chalard Jean   commited 2019-01-21 15:21:09 +09:00
b8997229ad
Merge changes Iec53a9fd,Iac4cfe70 am: 8621e44c39 am: 4a4e693e3e
am: 9d98567b3c

Change-Id: Ie225d000aeafb4a0b1e3910967c619fd932f239f

Lorenzo Colitti   authored and   android-build-merger   commited 2019-01-16 02:03:06 -08:00
2b889d5ddf
Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a am: 6b39032761
am: 9281e5c55f

Change-Id: I53948d2c3f50b9973e5b9483cf172b5932028f51

Lorenzo Colitti   authored and   android-build-merger   commited 2019-01-14 20:40:25 -08:00
0354d07f69
Test parceling empty LinkProperties.
Test: atest FrameworksNetTests
Change-Id: Iec53a9fdce1ba1db86751ea5f14a11d28be543eb

Lorenzo Colitti   commited 2019-01-15 12:53:59 +09:00
1d3bf3d90c
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

Lorenzo Colitti   commited 2019-01-12 02:16:34 +09:00
981b34f6b8
Merge changes from topic "IPMS1" am: 3627deac88 am: 946d156bce
am: 6452604181

Change-Id: I6908f68b1b9e7079384c4cc9f11c4e46cce694ce

Chalard Jean   authored and   android-build-merger   commited 2019-01-11 04:13:38 -08:00
ee81197cf2
[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

Chalard Jean   commited 2019-01-11 15:01:00 +09:00
6dd2486300
[MS01] Add the IP memory store service.
Bug: 116512211
Test: Added initial tests
Change-Id: I9d9af4097e3e2d7afd9956b9cbfa29a9f9558ae0

Chalard Jean   commited 2019-01-11 15:00:36 +09:00
d3829de504
Merge "Add PCSCF to LinkProperties." am: a99e1eeb9d am: aad967ed2a
am: a0b40fe2e7

Change-Id: I16eedc51ad4932b7ec6a32d9e718c48cf203c2f0

Chalard Jean   authored and   android-build-merger   commited 2019-01-09 22:29:15 -08:00
405ef49ce6
Merge "Add PCSCF to LinkProperties."
Chalard Jean   authored and   Gerrit Code Review   commited 2019-01-10 05:55:05 +00:00
a99e1eeb9d
Merge "Ignore ipv6 tx traffic on clat uid." am: 926c915708 am: 4d2e21a86c
am: 88539d94e3

Change-Id: I1ac85ac863026ea99117c5b0115bcc0c9144fb7b

Junyu Lai   authored and   android-build-merger   commited 2019-01-04 08:47:41 -08:00
453c09eec1
Merge "Ignore ipv6 tx traffic on clat uid."
Junyu Lai   authored and   Gerrit Code Review   commited 2019-01-04 09:29:10 +00:00
926c915708
Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480 am: 4e20619d98
am: b03827647f

Change-Id: I0a81b7b48bb02da202dd7feaa1440801b794ce67

Etan Cohen   authored and   android-build-merger   commited 2018-12-11 22:22:36 -08:00
1457e13e50
[CM] Fix comments, add tests to TransportInfo API
Bug: 117605977
Test: atest NetworkCapabilitiesTest
Change-Id: I734ec56e44cd09d11ae81a856a53a26e1191b9a0

Etan Cohen   commited 2018-12-11 15:00:10 -08:00
73fb5a86f0
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 12924cb23b am: f348c8d8a9
am: bc661e2a6e

Change-Id: I29c57276424464afd54e184c369d30a5e9707f14

Junyu Lai   authored and   android-build-merger   commited 2018-12-10 03:10:15 -08:00
20775e7c92
Merge "[CS] Add a generic transport-specific information API" am: 0e18882d5c am: 7081aa381d
am: 7e32ea6593

Change-Id: I47e0a7d62434b05d4692f9835af93c3a5dd61027

Etan Cohen   authored and   android-build-merger   commited 2018-12-10 02:39:46 -08:00
fef353db3b
Ignore ipv6 tx traffic on clat uid.
Currently, 464xlat counts its ipv6 tx traffic into root uid.
When user is making ipv4 upload over ipv6-only network, ipv4
tx traffic may sometimes be counted faster then ipv6 tx
traffic.

Thus, NetworkStatsService may detect non-monotonic values due
to 464xlat adjustment.

So the solution is that: for clatd, make ipv6 tx traffic counts
into clat uid, and then ignore it in the framework side.

Bug: 118602783
Test: 1. manually verify clatd traffic on clat uid.
      2. runtest frameworks-net

Change-Id: Ifb478b79e3e281918c70e16d1f90682c78f33db1

junyulai   commited 2018-12-10 15:19:03 +08:00
879dbfa624
Merge "Refactoring of deleting stats in NetworkStats based on uids."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-12-10 05:15:28 +00:00
12924cb23b
[CS] Add a generic transport-specific information API
Add a generic transport-specific information container interface and
access methods. These can be used by a network factory to pass transport
(bearer)-specific network parameters to the app.

Bug: 117605977
Test: atest frameworks/base/tests/net/java/android/net (+new unit tests)
Change-Id: Ib7c83b677e1c02a2212265719813e648b0c9cc1b

Etan Cohen   commited 2018-12-07 17:37:48 +00:00
ac07cca084
Refactoring of deleting stats in NetworkStats based on uids.
In follow-up commits, current API would create new NetworkStats
every time when 464xlatAdjustment wants to filtered out some
uids.

This commit refactors it to delete stats in-place to get better
performance.

Bug: 118602783
Test: atest FrameworksNetTests
Change-Id: I858f95d1fa7733111786243b4e261ce8a70a068d

junyulai   commited 2018-12-06 19:01:17 +09:00
edb60c461b
Add PCSCF to LinkProperties.
Some applications or services are needed PCSCF address to register IMS server but there is no way to get it on Android Framework.
We have added PCSCF address to LinkProperties like attached diff files.

Test: get Linkproperties and check Pcscf addresses.
      atest FrameworksNetTests

Change-Id: Ic2341a4ce2ed88d560325721766fc21f85f7ff86
Signed-off-by: Hongshik <hshik.kim@samsung.com>

Hongshik   commited 2018-12-05 22:05:49 +09:00
e2d7cf5aed
Merge changes from topic "xfrmi-support" am: f928c1e4b9 am: 4b7bb9f374
am: b71b2aefef

Change-Id: I9c543d38c88181b12cdbc7bdb93d7e38f1dfd425

Benedict Wong   authored and   android-build-merger   commited 2018-11-25 19:38:35 -08:00
c1f747bb5e
Add XFRM-I support to IpSecService
This change adds support for XFRM-I to all IpSecService netd calls.
Fallback logic is in netd, and thus both VTI and XFRM-I parameters are
always passed down to IpSecService.

Bug: 78589502
Test: All java, CTS tests passing
Change-Id: Ie4186f0ad7e50763b21831f6fa411b5ee436de78

Benedict Wong   commited 2018-11-21 08:34:54 -08:00
12b70569f9
Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Merged-In: I80b683e69da6beff3b37fc345fc15aa9610d09b7
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7

Etan Cohen   commited 2018-11-16 21:50:24 -08:00
ec1c466cb0
Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7

Etan Cohen   commited 2018-11-16 14:00:22 -08:00
42ab31a798
wifi(API): NetworkSpecifier for Wifi NetworkAgent
Create an @hide NetworkSpecifier to use by the Wifi NetworkAgent. This
will be used by connectivity service to match the incoming
NetworkRequest (with WifiNetworkSpecifier) with the NetworkAgent we
created to serve that request.
The WifiNetworkAgentSpecifier will hold the current connected wifi
network configuration which will be used to pattern match the
WifiNetworkSpecifier from NetworkRequest's.

Also, added a @hide helper method in MacAddress to help with matching
bssid pattern.

Bug: 113878056
Test: Unit tests
Change-Id: I9a643f0b914d48ff64104c798ec2869db40cb24b

Roshan Pius   commited 2018-10-31 09:23:15 -07:00
e26dae35e7
Fix negative uid stats caused by 464xlat adjust when eBPF is on.
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac

junyulai   commited 2018-10-30 21:23:38 +08:00
1d103a9809
Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845

Mike Yu   commited 2018-10-19 19:52:50 +08:00
96612aedb1
Add DhcpServingParams
Those parameters will be used to start DhcpServer or update its
configuration.

Test: runtest DhcpServingParamsTest.java
Bug: b/109584964
Change-Id: Id8d3dcf62d66dcb02accffa8d8500e30f07af452

Remi NGUYEN VAN   commited 2018-08-23 17:29:48 +09:00
aa3d9ac73b
Merge "Add utils to convert Inet4Address <-> int"
am: 2587292cd1

Change-Id: I347d23f4682eca623e3b10f72bc9000b1c5954a3

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-08-06 09:34:55 -07:00
c9f4d7be9e
Add utils to convert Inet4Address <-> int
The current utilities map the higher-order bytes of ints to the
lower-order bytes of IPv4 addresses, which makes applying masks and
generating series of addresses confusing.

For example, the current utilities would convert 1.2.3.4 to 0x04030201,
or generate 0x0080ffff for a /17 subnet mask. The utilities in this CL
convert 1.2.3.4 to 0x01020304, and a /17 subnet mask is represented as
0xffff8000.

Includes tests for all the above methods and migration of
NetworkUtilsTest to JUnit4.

Test: added tests pass
Change-Id: I5f5aa2e6e3b054b66b9dc507dab64f41be9139b1

Remi NGUYEN VAN   commited 2018-08-03 15:55:24 +09:00
6e2a93cf9a
Merge changes from topic "ipsec-sync-with-pi"
* changes:
  Disable the AppOp Restriction for IpSec Tunnels
  Rework Exception Handling for IpSecManager
  Update IpSecManager to use InetAddress and prefixLen
  Add AppOps Checks for MANAGE_IPSEC_TUNNELS
  Add MANAGE_IPSEC_TUNNELS Permission

nharold   authored and   Gerrit Code Review   commited 2018-06-08 17:07:11 +00:00
ff904be7a9
Update IpSecManager to use InetAddress and prefixLen
LinkAddress constructors are currently @hide; this change updates
IpSecManager to use InetAddress and prefixLen, and then construct a
LinkAddress internally. LinkAddress is used over the binder interface to
IpSecService to ensure validity.

Bug: 77528639
Test: CTS, Java unit tests ran on walleye
Merged-In: I19e124adef6d9f4992d8293db3190bcf74c95848
Change-Id: I19e124adef6d9f4992d8293db3190bcf74c95848
(cherry picked from commit 2ea91aee42)

Benedict Wong   authored and   Nathan Harold   commited 2018-06-07 18:42:52 -07:00
ba38f8b79f
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.

Bug: 66955045
Test: runtest frameworks-net
Merged-In: I17a4a286225b432c3e15ea1587d946189931b4f4
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
(cherry picked from commit 68a7edf1cb)

Nathan Harold   commited 2018-06-07 18:42:52 -07:00
2a9b2c8165
Fix setCapabilities.
P introduced setSSID, UIDs and unwanted capabilities.
None of these exhibit commutative behavior through combineCapabilities
because their semantics don't allow it. Therefore
NetworkRequest.setCapabilities() is badly broken around any of
these. Look at the comments in the new tests to realize the
extent of the damage.

Clean cherry-pick of ag/4083952

Bug: 79748782
Test: new tests written, old tests pass
Change-Id: Iafe074126132a82af37f4bf056c4a7b8d56bdc83
Merged-In: Ia5bebf8a233775367bbf1b788870528934ecbcfb
Merged-In: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1

Chalard Jean   commited 2018-06-06 08:24:43 +00:00
52a6d547b7
Add a new ssid field in NetworkCapabilities.
Clean cherry-pick of ag/3887737

Bug: 77891227
Test: frameworks-net
Change-Id: Icefe1657bca52b913a72b56705342a7285769658
Merged-In: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
Merged-In: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89

Chalard Jean   commited 2018-06-06 08:23:52 +00:00
390bee5f2c
Migrating remaining core networking tests to Junit4
Bug: 62918393
Test: runtest frameworks-net
Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677
(clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677)

Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e

Hugo Benichi   authored and   Remi NGUYEN VAN   commited 2018-05-24 16:24:47 +09:00
e17657c0f1
Merge "Fix setCapabilities." into pi-dev
am: cb42feb502

Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1

Chalard Jean   authored and   android-build-merger   commited 2018-05-22 01:01:39 -07:00
2e7a6c1b8f
Fix setCapabilities.
P introduced setSSID, UIDs and unwanted capabilities.
None of these exhibit commutative behavior through combineCapabilities
because their semantics don't allow it. Therefore
NetworkRequest.setCapabilities() is badly broken around any of
these. Look at the comments in the new tests to realize the
extent of the damage.

Bug: 79748782
Test: new tests written, old tests pass
Change-Id: Ie46581bdaf9ecc2f14aab44788bbdb27a3fec8c1

Chalard Jean   commited 2018-05-21 14:46:40 +09:00
e15627ef72