Commit graph android_packages_modules_Co.../tests/net/java
Message SHA1
Merge "Address leftover comments on 923337 and 930217." am: b5db40605c am: 5d94f74e87
am: 426f2771e0

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65

Paul Hu   authored and   android-build-merger   commited 2019-04-02 01:29:08 -07:00
91252ebe9a
Merge "Address leftover comments on 923337 and 930217."
Paul Hu   authored and   Gerrit Code Review   commited 2019-04-02 07:39:04 +00:00
b5db40605c
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 79a5776e79 am: 0756750737
am: 8b207facf4

Change-Id: I9e74dc9bf30a53ce78395e502a52891ba488f4b1

Paul Hu   authored and   android-build-merger   commited 2019-04-01 19:24:38 -07:00
0ed9ca1ca2
Fix IpPrefixTest#testContainsInetAddress fail.
The argument of IpPreFix#contains() has been marked as @NonNull.
So the IpPrefixTest#testContainsInetAddress should not test
contains() method wiht null object.

Bug: None
Test: atest FrameworksNetTests
      atest IpPrefixTest#testContainsInetAddress

Change-Id: I2f6bee19514dc47702f64d2a2bbf02d8b7b1b407

paulhu   commited 2019-04-02 00:49:00 +08:00
da137d9082
Merge "Add DHCP address lease expiry in IpMemoryStore." am: 0f1ffb3b77 am: 5bdb41fdcf
am: 72da4758de

Change-Id: Ib09ee6a702fb25a682d4782a8822237ebb9a0dfb

Xiao Ma   authored and   android-build-merger   commited 2019-04-01 06:35:34 -07:00
b6fd5dc3c0
Merge "Add DHCP address lease expiry in IpMemoryStore."
Xiao Ma   authored and   Gerrit Code Review   commited 2019-04-01 12:59:20 +00:00
0f1ffb3b77
Address leftover comments on 923337 and 930217.
- Restrict unprivileged apps to use
  NetworkRequest.Builder#setSignalStrength.

- Remove the "throws NullPointerException" in
  CaptivePortalProbeSpec constructor.

- Remove the null check in LinkProperties.

- Add annotataion into all ConnectivityManager.NetworkCallback
  methods.

Change-Id: Id275cac1d6a30d7515cd7b113394f5e8a0179314
Fix: 129097486
Test: atest FrameworksNetTests

paulhu   commited 2019-04-01 16:24:10 +08:00
a9a6e2a2a2
Merge "Fix race when starting NetworkMonitor" am: ca5b44477a am: 9e85030e71
am: bf761cce3e

Change-Id: I595ecdbf0b8e91fec4287c3476239a1e6c9c80a7

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-31 21:35:25 -07:00
ede73bb437
Merge "Fix race when starting NetworkMonitor"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-01 03:54:03 +00:00
ca5b44477a
Fix race when starting NetworkMonitor
NetworkMonitor obtained LinkProperties and NetworkCapabilities via
synchronous calls to ConnectivityManager after receiving an asynchronous
notification, which is prone to races: the network could be gone before
the LinkProperties/NetworkCapabilities can be fetched.

Fix the race by passing LinkProperties/NetworkCapabilities directly to
NetworkMonitor in the asynchronous notifications.

Test: atest FrameworksNetTests NetworkStackTests
Test: booted, WiFi works
Bug: 129375892
Change-Id: I200ac7ca6ff79590b11c9be705f650c92fd3cb63

Remi NGUYEN VAN   commited 2019-04-01 11:33:10 +09:00
f59a5d4580
Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: 8c3d79e813 am: 3b2c0dda05
am: bdf234395b

Change-Id: I2d642b71df25934fddd8a1476b5d27457628b8e2

Luke Huang   authored and   android-build-merger   commited 2019-03-29 02:24:24 -07:00
592905c826
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-29 08:45:19 +00:00
8c3d79e813
Add DHCP address lease expiry in IpMemoryStore.
Bug:122710829
Test: atest FrameworksNetTests
Change-Id: I643fe1231edcd18923514ab66c64a6cf83e69443

Xiao Ma   commited 2019-03-29 16:51:47 +09:00
314a2312aa
Merge changes from topic "vpn_data_accounting"
* changes:
  Move BatteryStats and StatsCompanionService to use NetworkStatsService.
  NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
  Take all VPN underlying networks into account when migrating traffic for VPN uid.

Varun Anand   authored and   Gerrit Code Review   commited 2019-03-29 00:40:53 +00:00
f004bcbbf5
NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
This API is similar to one provided by NetworkStatsFactory with the
difference that NSS also migrates traffic from VPN UID to other apps.

Since traffic can only be migrated over NetworkStats delta, NSS
therefore maintains NetworkStats snapshot across all UIDs/ifaces/tags.

This snapshot gets updated whenever NSS records a new snapshot
(based on various hooks such as VPN updating its underlying networks,
network getting lost, etc.), or getDetailedUidStats API is invoked by
one of its callers.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manually verified that battery stats are migrating traffic off of
TUN (after patching above CL where we point BatteryStats to use this
API).
Change-Id: Ib0f0c2d4d41ee1d7a027ea9da457baaf198d649e

Varun Anand   commited 2019-03-28 10:31:51 -07:00
23e1e5e300
Take all VPN underlying networks into account when migrating traffic for
VPN uid.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
      appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java

Change-Id: I9d8d0cc58d18002c1c96f8ddff780ef8dc452d21

Varun Anand   commited 2019-03-28 10:31:49 -07:00
2dbf6e6978
Merge changes I0baf582f,I4bba01ba am: ae26195e6a am: 92adef2970
am: 9cd8136d86

Change-Id: I2cc021899270b41e4b9047ef32869af53ea6fb65

Junyu Lai   authored and   android-build-merger   commited 2019-03-27 18:43:18 -07:00
4bfa391000
Merge changes I0baf582f,I4bba01ba
* changes:
  Block unpriviledged apps which create keepalives with null fd
  Fix keepalive don't get removed when lower layer error

Junyu Lai   authored and   Gerrit Code Review   commited 2019-03-28 00:53:20 +00:00
ae26195e6a
Block unpriviledged apps which create keepalives with null fd
Currently, socketKeepalive implementation is accepting null fd
due to backward compatibility with legacy packet keepalive API.
However, due to lack of the fd, the service cannot guarantee the
port is not reused by another app if the caller release the port
for any reason.

Thus, grant the null fd access only for priviledged apps.

This commit also address some comments from aosp/918533.

Bug: 126699232
Test: atest FrameworksNetTests
Change-Id: I0baf582ff4ca8af6082c3754e8dfbcd867f39792

junyulai   commited 2019-03-27 19:51:08 +08:00
c4fb248ef7
Use IDnsResolver instead of INetd for resolver related binder commands
migrate resolver related commands from INetd to IDnsResolver

Bug: 126141549
Test: atest FrameworksNetTests ConnectivityServiceTest Nat464XlatTest
      atest DnsManagerTest
Change-Id: I559c0c1304d53dde408c062e1a52e742595e7cbe

Luke Huang   commited 2019-03-27 17:39:07 +08:00
e3d6a7907b
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am: 15b9eb4e43 am: 8fc2439929
am: 8c64dd081a

Change-Id: I80399f9980119342ba5cd3d4f1922badb1fee3e9

Lucas Lin   authored and   android-build-merger   commited 2019-03-26 19:00:50 -07:00
06a19ccd6d
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
Lucas Lin   authored and   Gerrit Code Review   commited 2019-03-27 01:29:51 +00:00
15b9eb4e43
Fix flaky test for ConnectivityServiceTest#testPartialConnectivity
There are 2 problems will make testPartialConnectivity flaky:
1. If we call setNetworkValid() before expectCapabilitiesWith(),
there may be a timing issue that network will become VALID before
NetworkMonitor send PARTIAL_CONNECTIVITY to ConnectivityService.
Solution:
We should set network to valid after ConnectivityService received
NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY to ensure NetworkMonitor
will send PARTIAL_CONNECTIVITY to ConnectivityService first then
send VALID.

2. When test case call explicitlySelected(true) first then call
connect(true), NetworkMonitor will report the network validation
test result twice because ConnectivityServiceTest() will trigger
notifyNetworkTested() when setAcceptPartialConnectivity() is
called, it may cause a timing that before the second test result
send to ConnectivityService, connect() already called
setNetworkInvalid. So, NET_CAPABILITY_VALIDATED will be removed
and ConnectivityService will trigger onCapabilitiesChanged()
unexpectedly.
Solution:
Don't trigger notifyNetworkTested() when
setAcceptPartialConnectivity() is called. If there is needed,
use mCm.reportNetworkConnectivity() to report the test result
instead.

Bug: 128426024
Test: 1. atest FrameworksNetTests: \
      ConnectivityServiceTest#testPartialConnectivity \
      --generate-new-metrics 1000

Change-Id: I7200528378201a3c7c09a78ff827b41f2741dfa1

lucaslin   commited 2019-03-26 17:49:49 +08:00
563b751b21
Merge "Reveal the call trace of failed test cases which run in executors" am: 43dc93b180 am: ca9b494b83
am: a71b378095

Change-Id: I023c8140c94966479db7f12647838699324462af

Junyu Lai   authored and   android-build-merger   commited 2019-03-26 00:13:47 -07:00
23bf315b90
Merge "Reveal the call trace of failed test cases which run in executors"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-03-26 06:38:39 +00:00
43dc93b180
Merge "[TCPKeepalive] Fill correct TOS and TTL value" am: bd1567cbae am: 493e5319f6
am: 1368554fc5

Change-Id: I80c56a14a0be2e6b7996f2bcb9a1a320f0c2c058

Mark Chien   authored and   android-build-merger   commited 2019-03-25 06:44:17 -07:00
de617f4a74
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
Mark Chien   authored and   Gerrit Code Review   commited 2019-03-25 13:10:17 +00:00
bd1567cbae
Reveal the call trace of failed test cases which run in executors
Currently, the fails in testTcpSocketKeepalives are triggered by
fail() inside the executor, which is hiding the actual call trace
but only message remains. And it made the fail case hard to
debug.

So this commit is to bubble up the Exception by using a custom
functional interface.

Bug: 123987272
Test: 1. atest FrameworksNetTests
      2. manually fail the test case and see the call trace

Change-Id: I125e673938a5e9d1de86f83c1a732227a4bd3207

junyulai   authored and   Junyu Lai   commited 2019-03-25 12:56:47 +00:00
b454b0fc0e
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 5fdd1748fa am: b7ed180e64
am: 7f8cfa3536

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be

Junyu Lai   authored and   android-build-merger   commited 2019-03-25 04:16:18 -07:00
639ba7742d
Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.

Fix: 126698610
Fix: 126699425
Fix: 126699232
Fix: 126700278

Test: 1. m -j
      2. atest FrameworksNetTests --generate-new-metrics 50
      3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a

junyulai   commited 2019-03-25 15:56:35 +08:00
6114378ad2
[TCPKeepalive] Fill correct TOS and TTL value
Fill correct TOS/TTL value by fetching them from kernel with
getsockopt.

bug: 123967966
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I75b1be51040b4a381163958b4cddd27dbb22bac1

markchien   commited 2019-03-25 11:14:57 +08:00
d2c678b32f
Merge "Fix Automated API Review issues." am: e9109ceb23 am: fa662c4b91
am: 67646b0f22

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98

Paul Hu   authored and   android-build-merger   commited 2019-03-21 11:54:51 -07:00
9acc3e21d1
Merge "Fix Automated API Review issues."
Paul Hu   authored and   Gerrit Code Review   commited 2019-03-21 17:19:26 +00:00
e9109ceb23
Merge "Temporarily disable flaky test." am: d2ff961201 am: ead65ee6f8
am: c20c0bd4d9

Change-Id: I583ed9aa0e42e864ef0c1e74fbcd9357e093cc25

lucaslin   authored and   android-build-merger   commited 2019-03-21 08:39:31 -07:00
372cc04dc3
Merge "Temporarily disable flaky test."
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-21 15:04:15 +00:00
d2ff961201
Merge "Replace TcpSocketInfo with similar structure" am: 19a71f90e4 am: 192c20eed5
am: bd4c1878c3

Change-Id: I9b51e6905245ada2707ef7498cc1b8e4cb4c69a0

Mark Chien   authored and   android-build-merger   commited 2019-03-21 05:35:15 -07:00
fc638407f2
Merge "Replace TcpSocketInfo with similar structure"
Mark Chien   authored and   Gerrit Code Review   commited 2019-03-21 12:02:54 +00:00
19a71f90e4
Temporarily disable flaky test.
Test: None
Bug: 128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f

lucaslin   commited 2019-03-21 19:14:32 +08:00
0f755c31a5
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: cfd6cdf447 am: f3b2546131
am: df6794ca21

Change-Id: Ib6730d87eeebcd82964feeb96d12c09ae652d0d5

Luke Huang   authored and   android-build-merger   commited 2019-03-20 23:40:30 -07:00
d7a9b23429
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-21 06:01:25 +00:00
cfd6cdf447
Fix Automated API Review issues.
1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name

Bug: 126700123
Bug: 126702339
Bug: 126699682
Bug: 118296575
Bug: 126699216
Bug: 126699675
Bug: 126699429
Bug: 126699193
Bug: 123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6

paulhu   commited 2019-03-21 13:55:37 +08:00
9bb0480c2a
Merge "Improve partial connectivity" am: ce8235772b am: 8f78c70595
am: 7e756a45cd

Change-Id: I25f9d056c26bf947c2e09516da51b627c3da9685

Lucas Lin   authored and   android-build-merger   commited 2019-03-20 21:15:34 -07:00
59bab9709f
Merge "Improve partial connectivity"
Lucas Lin   authored and   Gerrit Code Review   commited 2019-03-21 03:34:30 +00:00
ce8235772b
Replace TcpSocketInfo with similar structure
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable
because their structures are very similar.

bug: 128882321
Test: -build, flash, boot
      -FrameworksNetTests

Change-Id: Iafb4031a64ba4775a495c156e2c997d890c6b261

markchien   commited 2019-03-20 22:29:48 +08:00
0fcb07885b
Cleanup NetworkManagementService for Netd commnads binder migrartion
remove dead code used for netd UNIX sokcet

Bug: 65862741
Test: atest NetworkManagementServiceTest FrameworksNetTests
Change-Id: I5db61cb86325b71ac8a8fce7b15dbf569abc5935

Luke Huang   commited 2019-03-20 20:02:24 +08:00
c5fdf01476
Improve partial connectivity
Improve the design and fix some nits.

Bug: 113450764
Test: 1. Build pass
      2. atest FrameworksNetTests
      3. atest NetworkStackTests
      4. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.
Change-Id: Ia56645841d00d2ed8406cfeacb86a4a27fd58650

lucaslin   commited 2019-03-20 18:21:59 +08:00
2afb4bcbcb
Merge "Add Parcelable implementation for ApfCapabilities" am: 9a35341fe2 am: 78d8ff6bf8
am: 887c5f639d

Change-Id: I4d878b8dc0928aca47f944050becaa4d5206e336

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-19 18:09:23 -07:00
b03aada33f
Merge "Add Parcelable implementation for ApfCapabilities"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-03-20 00:34:53 +00:00
9a35341fe2
Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 0572cf6752 am: 42db9375aa
am: fefcada377

Change-Id: I80e3ebb556ac0b6bff5d232b881f7d869cb74f00

Varun Anand   authored and   android-build-merger   commited 2019-03-19 09:47:04 -07:00
fb2624d4f3
Merge "Add unit tests related to data accounting for VPNs with one underlying network."
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-19 16:18:28 +00:00
0572cf6752