Commit graph android_packages_modules_Co.../tests/net/java/com/android
Message SHA1
Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am: 41e1a5436b
am: a096e8d177

Change-Id: I23ea94140ac3e34fc92fdc6a2c0d694396489e03

Manoj Boopathi Raj   authored and   android-build-merger   commited 2017-10-27 18:06:09 +00:00
b4f2c19f0b
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
Manoj Boopathi Raj   authored and   Gerrit Code Review   commited 2017-10-27 17:32:56 +00:00
41e1a5436b
Fixed NullPointerException in IpSecService-Netd binder layer
Replaced null with empty byte array in createTransportModeTransform
for null auth.getKey, crypt.getKey() and authCrypt.getKey()

Test: Ran CTS test
Bug: 68052730
Change-Id: I5110b1297b4bfbb5766e8ecfd3d64f8110b52945

Manoj Boopathi Raj   authored and   manojboopathi   commited 2017-10-26 13:10:22 -07:00
8091bd5aaa
Merge changes I59b6e04f,I55694d89 am: b3e7b54ae6
am: 93134fea64

Change-Id: I923fe9cc37463e695182c7a279d201ba7e9d6518

Hugo Benichi   authored and   android-build-merger   commited 2017-10-26 06:23:31 +00:00
b3595daa95
Remove Parcelable interface from DefaultNetworkEvent
This patch takes advantage of the direct DefaultNetworkMetrics interface
between ConnectivityService and IpConnectivityMetrics and removes the
Parcelable interface from DefaultNetworkEvent.

IpConnectivityMetrics, IpConnectivityEventBuilder and associated tests
are updated as necessary.

Bug: 34901696
Test: runtest frameworks-net
Change-Id: I59b6e04fc126051320d08a422cfbd4d27042123e

Hugo Benichi   commited 2017-10-25 12:40:13 +09:00
aa4ccf14c4
Extract logging of default network events
This patch extracts the logging of DefaultNetworkEvent from inside
ConnectivityService and move it to a new DefaultNetworkMetrics class.

The DefaultNetworkMetrics is a singleton owned by the
IpConnectivityMetrics singleton implementing the metrics service for
core networking. ConnectivityService has access to this singleton via
LocalServices.

This class layout will allow to remove the Parcelable interface of
DefaultNetworkEvent and will instead let the IpConnectivityMetrics
service grab metrics from the DefaultNetworkMetrics directly.

Bug: 34901696
Test: runtest frameworks-net
Change-Id: I55694d89124272732aba114198776462372de18b

Hugo Benichi   commited 2017-10-25 12:36:29 +09:00
71ce5d2ef4
Merge "Return a port from bindToPort() in IpSecService" am: fa52bd7a63
am: 6401f5ea34

Change-Id: Ie59d496a38bf9775c1f40a543a24cb3fec5719bf

Benedict Wong   authored and   android-build-merger   commited 2017-10-24 16:54:57 +00:00
4baf2d6f3e
Merge "Return a port from bindToPort() in IpSecService"
Benedict Wong   authored and   Gerrit Code Review   commited 2017-10-24 16:31:21 +00:00
fa52bd7a63
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: 9174bcafc7
am: f92bfc3b77

Change-Id: I49932a5fc048b4a60512fac45a3537f050397168

Benedict Wong   authored and   android-build-merger   commited 2017-10-19 17:37:22 +00:00
6fa3219ab8
Return a port from bindToPort() in IpSecService
When binding to a random port, the port number was not being
returned, so the user is incorrectly receiving a port of zero.
Return the port number that was ultimately bound.

Bug: 67662580
Test: Ran CTS test on aosp_angler-eng
Change-Id: I22f4e5cdc83d43dc453788889990feb34e451bd3

Benedict Wong   commited 2017-10-18 11:43:43 -07:00
782ab176f0
Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support

Bug: 63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21

Benedict Wong   commited 2017-10-18 11:22:24 -07:00
b4f26960f6
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: 08c7808601 am: 43f626b99d
am: 4071792cce

Change-Id: Id5ee94ae9a7e2a92289f2b25b0d5c0f0b5b7381a

Hugo Benichi   authored and   android-build-merger   commited 2017-10-15 02:53:58 +00:00
e0464277a3
Fix ConnectivityServiceTest#testNetworkCallbackMaximum
Although commit af17b51ec1 fixed some flakyness issues in
testNetworkCallbackMaximum so that it became stable when ran on its own,
it introduced a new source of random failures because instead of
registering callbacks after callbacks until a limit was reached, commit
af17b51ec1 changed the test logic to push the assertions right up to
the theoretical limit.

More precisely when registering and unregistering PendingIntents in a
loop, not introducing some delay for checking that previous
PendingIntents have been effectively unregistered can cause the test to
fail. This patch fixes this issue.

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
      testNetworkCallbackMaximum now succeeds 100 in a row on sailfish

Change-Id: I086817a738ab99fd53ba76ca8faada6151f46472

Hugo Benichi   commited 2017-10-12 23:15:14 +09:00
aca7198d06
Merge "Migrate most of core networking tests to junit4" am: 947dd7a42d am: d85e14a1e4
am: c40687f85a

Change-Id: Ic59ca37bbb31ba091c8b6d31170584b946c2527a

Hugo Benichi   authored and   android-build-merger   commited 2017-10-12 09:43:11 +00:00
b892b7ac3c
Migrate most of core networking tests to junit4
This patch is a batch of mechanical changes to test classes to migrate
away from AndroidTestCase and TestCase.

Bug: 62918393
Test: runtest frameworks-net
Change-Id: I74134609e511f22c4d9ecd65780e981f9ba7ae3f

Hugo Benichi   commited 2017-10-12 15:26:09 +09:00
a046c5b078
Merge "Add some useful helpers and constants." am: ed8d236319 am: e992e16ffb
am: 06d401ae73

Change-Id: Iaf611b8e39080d677c9cfe7edb124c11bbdf8a81

Chalard Jean   authored and   android-build-merger   commited 2017-10-06 10:11:04 +00:00
8b1c95df43
Add some useful helpers and constants.
Test: Pulled out of a client app ; the client app is behaving
Test: identically to how it was behaving before. Wrote unit
Test: tests in frameworks-net.

Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7

Chalard Jean   commited 2017-10-06 13:38:46 +09:00
3b71316a55
Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f am: 10b5cc50d7
am: 4e793fd0b5

Change-Id: Ib7eae5c9e223493281524e862979e16d25984dde

nharold   authored and   android-build-merger   commited 2017-10-04 20:53:04 +00:00
7a094452fa
Split IpSecServiceTest to add IPv6 Tests
-Split IpSecServiceTest into parameterized
 and single tests.
-Add IPv6 parameters

Bug: 66954381
Test: this
Change-Id: Ib98c112560014f73bccc3d2842c31d297c7a07ef

Nathan Harold   commited 2017-10-03 19:45:59 -07:00
81ad618eef
Input Validation for IpSecService
All of the input to IpSecService over the Binder
interface needs to be validated both for sanity
and for safety.

-Sanity check all the parameters coming from binder.
-Added setters for IpSecConfig to decouple the test
 from the IpSecManager. This was needed because the
 input validation caused the tests to fail due to a
 null parameter that was previously un-tested.
-Added the mode flag to the IpSecConfig bundle this
 oversight was found during testing.
-Expose the getResourceId() methods for testing in
 UdpEncapsulationSocket, SecurityParameterIndex, and
 IpSecTransform classes.
-Remove the unneeded getIpSecConfig() from
 IpSecTransform: unneeded now that we can synthesize
 configs.

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I5241fc7fbfa9816d54219acd8d81a9f7eef10dd4

Nathan Harold   commited 2017-10-03 19:45:55 -07:00
25acd5d0e3
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0 am: 50a87f5492
am: eced6cd14a

Change-Id: I53d0d6755c8e0be34db66da56efa483006e538ac

Hugo Benichi   authored and   android-build-merger   commited 2017-10-02 10:51:21 +00:00
c3d8a47a54
ConnectivityServiceTest: fix flaky testNetworkRequestMaximum
Registered requests are not keyed by PendingIntents in
ConnectivityService, which means that unregistering a request with a
PendingIntent causes a linear search in all registered requests.

testNetworkRequestMaximum was registering too many PendingIntents
simultaneously, causing the unregistration loop to have n^2
complexity and to take a long time to take effect.

To make the unregistering loop less likely to trigger a timeout on
waitForIdle, this patch changes the test to not register MAX_REQUEST
number of PendingIntent, but instead mixes a small number of
PendingIntents with NetworkCallbacks to reach MAX_REQUEST number of
simultaneously registered requests.

When unregistering these requests, callbacks are unregistered first.

Bug: 32561414
Test: runtest frameworks-net
Change-Id: I48b882c884abe20b388190b7f28baee293446f37

Hugo Benichi   commited 2017-10-02 17:37:57 +09:00
af17b51ec1
Merge "Fix NPE in NsdServiceTest" am: 2240c54b87 am: b0c566c477
am: a5d620ae92

Change-Id: Ieb299771438fe55566b76271815e52d02da799c8

Hugo Benichi   authored and   android-build-merger   commited 2017-09-28 12:35:03 +00:00
07ff2cd04f
Merge "Fix NPE in NsdServiceTest"
Hugo Benichi   authored and   Gerrit Code Review   commited 2017-09-28 12:13:18 +00:00
2240c54b87
Fix NPE in NsdServiceTest
Continuous test dashboards report that quit() can crash sometimes
due to mThread being null.

This patch adds a null guard in tearDown().

Bug: 32561414
Test: runtest frameworks-net
Change-Id: If66fb47e31e77d25b4741a786f12eb78f0b9102e

Hugo Benichi   commited 2017-09-28 15:22:13 +09:00
8d6846b3ad
Merge "Delete the legacy framework code for manipulating ND offload." am: 90f8fada03 am: 41f36738bf
am: bb21618a86

Change-Id: I07d9753e214af311d3dcab6f8016442f60388700

Lorenzo Colitti   authored and   android-build-merger   commited 2017-09-27 11:05:29 +00:00
54fd815ced
Merge "Delete the legacy framework code for manipulating ND offload."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2017-09-27 10:46:36 +00:00
90f8fada03
Merge "Declare support for Ethernet if the service is running." am: e7a82bbaf3 am: dae0a11792
am: a6648cc90b

Change-Id: Iafd9807ab76ce4e4ab1fd506d7b0e2b2b7017751

Lorenzo Colitti   authored and   android-build-merger   commited 2017-09-27 08:51:51 +00:00
640e28df16
Merge "Declare support for Ethernet if the service is running."
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-09-27 08:23:34 +00:00
e7a82bbaf3
Delete the legacy framework code for manipulating ND offload.
This only worked on broadcom devices, and was superseded in
M by a wifi HAL call made by IpManager.

Test: bullhead builds, boots
Change-Id: I711cae7dafe171c2c8b4e84a229adbcad27f3d14

Lorenzo Colitti   commited 2017-09-27 16:47:36 +09:00
6c4ad77737
Declare support for Ethernet if the service is running.
On some devices, support for TYPE_ETHERNET is not specified in
the networkAttributes config resource, even though the device is
capable of supporting Ethernet (e.g., via USB host adapters).
This leads to Ethernet working but various connectivity APIs
behaving as if it was not - for example, no CONNECTIVITY_ACTION
broadcasts will be issues when it connects or disconnects.

Ensure that ConnectivityService always treats Ethernet as
available if the service is running. Currently the service is
started if the device supports FEATURE_ETHERNET or
FEATURE_USB_HOST.

Bug: 37359230
Test: bullhead builds, boots
Test: ConnectivityServiceTest passes
Test: Ethernet is available even if removed from networkAttributes resource
Test: ConnectivityManagerTest CTS test passes
Change-Id: I58801bf4f0bbdc3ff6345ec6bfdc911ce045c8ab

Lorenzo Colitti   commited 2017-09-27 13:03:10 +09:00
4c535bcc03
Merge changes Ia47e566b,Ib94d79a9 am: 1c05049a5b am: 6094886f51
am: b91bd88c5e

Change-Id: Ied2b31c9d1219b8aebf5fec085ab598b77bede6e

Hugo Benichi   authored and   android-build-merger   commited 2017-09-26 13:05:41 +00:00
f0145debdc
Extract RingBuffer class from NetdEventListenerService
This patch takes out the ring buffer array added for NFLOG wakeup packet
events logging and extract it into its own class for reuse. This new
RingBuffer class has the two minimal useful functions append() and
toArray().

Bug: 65164242
Bug: 65700460
Test: runtest frameworks-net, with new unit test
Change-Id: Ib94d79a93f4e99661b7d0fac67117b91d57af980

Hugo Benichi   commited 2017-09-26 14:14:16 +09:00
accf6091e8
Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: e7adef3b1f
am: 1347ac8109

Change-Id: I83ae39a2e36bc036dce419c80dd476d2358b4537

Erik Kline   authored and   android-build-merger   commited 2017-09-21 12:06:05 +00:00
75ed6c018e
Also support 464xlat on SUSPENDED networks
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 65684232

Change-Id: I1b10aab01554b1f926ec7157dba78645fdaff90f

Erik Kline   commited 2017-09-21 18:06:29 +09:00
c3e3f84531
Merge changes from topic "vpn-dialog" am: 5ebd6035ec am: 9db0d719c4
am: a9f6384b6a

Change-Id: I853f48a75865008ac8b976eec1af56fb1870a1b3

Charles He   authored and   android-build-merger   commited 2017-09-19 08:25:16 +00:00
8f619858a4
Merge changes from topic "vpn-dialog"
* changes:
  Unbreak VPN unit tests.
  Add alert dialog when always-on VPN disconnects.

Charles He   authored and   Gerrit Code Review   commited 2017-09-19 07:56:44 +00:00
5ebd6035ec
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.

Bug: 36650087
Bug: 65439160
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
Merged-In: Icff57c7e927c135d75a7d70ff347a579c5d45134
(cherry picked from commit 3da6a1fc82b7e0c7adc88b92e50cceec8173672e)

Charles He   commited 2017-09-19 07:56:36 +00:00
ddcbabb472
Merge changes from topic "always-on-vpn"
* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN

Charles He   authored and   Gerrit Code Review   commited 2017-09-19 07:50:13 +00:00
9bab00f0e3
Merge "Wakeup packet events: addressing a few comments" am: 8e1f9cba10 am: 857584f17c
am: 19625788a1

Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95

Hugo Benichi   authored and   android-build-merger   commited 2017-09-19 07:36:12 +00:00
4e625c6408
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits f562ac34a51dc and 60c9f63b66921.

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30

Hugo Benichi   commited 2017-09-19 14:07:47 +09:00
97b3983d68
Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am: b81fc1cf14 am: eb2a4615e2
am: b025492a6b

Change-Id: I5385a3747e039a42e86034f7632edd0f855b2eb1

Hugo Benichi   authored and   android-build-merger   commited 2017-09-14 18:11:06 +00:00
0f423e3ef7
Merge changes Ie2676b20,Ie8db6f85 am: 75018a77e7 am: bb625588ce
am: 7d16886c7e

Change-Id: Ifd0ace409909d258db3738e58126bbf1c48af5dc

Hugo Benichi   authored and   android-build-merger   commited 2017-09-14 18:02:14 +00:00
45cd72d1a7
Merge changes I4719b4dc,I0308cdf4,I38db1bb7
* changes:
  IpManagerTest: fix flaky test
  Fix flaky NsdManagerTest
  Boostrap test for NetworkMonitor

Hugo Benichi   authored and   Gerrit Code Review   commited 2017-09-14 11:59:58 +00:00
b81fc1cf14
Connectivity metrics: add WakeupStats events
This patch defines a new WakeupStats event in ipconnectivity.proto and
populates these events from the NFLOG wakeup events stored in
NetdEventListenerService.

There is one WakeupStats object per known interface on which ingress
packets arrive and may wake the system up.

Example from $ adb shell dumpsys connmetrics list:

UPDATEME
...
WakeupStats(wlan0, total: 58, root: 0, system: 3, apps: 38, non-apps: 0, unrouted: 17, 6111s)
WakeupEvent(13:36:31.686, iface wlan0, uid -1)
WakeupEvent(13:38:50.846, iface wlan0, uid -1)
WakeupEvent(13:39:16.676, iface wlan0, uid 10065)
WakeupEvent(13:40:32.144, iface wlan0, uid 1000)
WakeupEvent(13:40:35.827, iface wlan0, uid 1000)
WakeupEvent(13:40:47.913, iface wlan0, uid 10004)
WakeupEvent(13:40:52.622, iface wlan0, uid 10014)
WakeupEvent(13:41:06.036, iface wlan0, uid 10004)
...

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: Ie2676b20bfb411a1902f4942643df0c20e268d99

Hugo Benichi   commited 2017-09-14 13:29:56 +09:00
ec5392def4
Boostrap test for NetworkMonitor
This will finally allow to write captive portal detection unit tests.

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I38db1bb79ae80a82b4199dc9cb1b56257e0cf222

Hugo Benichi   commited 2017-09-13 16:21:50 +09:00
c400fe3d5b
Connectivity metrics: collect NFLOG wakeup events
This patch stores NFLOG packet wakeup events sent by Netd to the system
server into a ring buffer inside NetdEventListenerService. The content
of this buffer is accessible by $ dumpsys connmetrics or $ dumpsys
connmetrics list, and is added to bug reports.

The wakeup event buffer stores currently uid and timestamps.

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net, new unit tests
Change-Id: Ie8db6f8572b1a929a20398d8dc03e189bc488382

Hugo Benichi   commited 2017-09-12 10:02:13 +09:00
0c6ad8f368
Opt-out for always-on VPN: rename API.
Rename the opt-out flag in AndroidManifest to
SERVICE_META_DATA_SUPPORTS_ALWAYS_ON
as directed by the API Council.

Bug: 64331776
Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Change-Id: I24326fad7a89083a2409134640bda81ee0359d08
Merged-In: I24326fad7a89083a2409134640bda81ee0359d08
(cherry picked from commit 4bfaefeb95)

Charles He   commited 2017-09-08 10:47:34 +01:00
fc82f590ea
Opt-out for always-on VPN
Always-on VPN is a feature introduced in N. Since then, all VPN apps
targeting N+ are assumed to support the feature, and the user or the DPC
can turn on / off always-on for any such VPN app. However, a few VPN
apps are not designed to support the always-on feature. Enabling
always-on for these apps will result in undefined behavior and confusing
"Always-on VPN disconnected" notification.

This feature provides a new manifest meta-data field through which a VPN
app can opt out of the always-on feature explicitly. This will stop the
always-on feature from being enabled for the app, both by the user and
by the DPC, and will clear its existing always-on state.

A @hide API is provided to check whether an app supports always-on VPN.
Documentation is updated to reflect the behavior change.

Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'

Change-Id: I477897a29175e3994d4ecf8ec546e26043c90f13
Merged-In: I477897a29175e3994d4ecf8ec546e26043c90f13
(cherry picked from commit 729f0b476d)

Charles He   commited 2017-09-08 10:18:36 +01:00
59b362d218
IP connectivity metrics: fix tests after proto update
Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)

Bug: 34901696
Bug: 65439160
Test: runtest frameworks-net
Merged-In: I57a6bad8a9836b1c45690c4589b416786ce1dfa0

(cherry picked from commit 68d99ea1af)

Change-Id: I98b23b2208bbd7d12237fcb000f3cf10c53d9e55

Hugo Benichi   commited 2017-09-07 22:17:18 +09:00
8bebf411cc