Commit Graph

5458 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
e06ae295a2 Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
am: e01b4ce6c7

Change-Id: I1800eb214d501e76b8705a27ca817000d009736e
2018-08-23 20:33:45 -07:00
Remi NGUYEN VAN
a420b57a6b Add DhcpServingParams
Those parameters will be used to start DhcpServer or update its
configuration.

Test: runtest DhcpServingParamsTest.java
Bug: b/109584964
Change-Id: Id8d3dcf62d66dcb02accffa8d8500e30f07af452
2018-08-23 17:29:48 +09:00
Remi NGUYEN VAN
eca5b4e753 Add DhcpLeaseRepository
This is a first component to build the new DHCP server.

Test: added tests pass
Bug: b/109584964
Change-Id: I5657d89c3010a23e9289ac827bf78381477d1355
2018-08-23 15:55:39 +09:00
Colin Cross
b2c0c112fb Merge "Convert frameworks-base-testutils to Android.bp"
am: de2bfe1ddf

Change-Id: Ib543af4cb90c84d9914178912a2834ac869c908b
2018-08-17 18:02:19 -07:00
Treehugger Robot
de2bfe1ddf Merge "Convert frameworks-base-testutils to Android.bp" 2018-08-17 23:12:22 +00:00
Remi NGUYEN VAN
a788c6816b Merge "Fix testRegisterUsageCallback failure in setUp"
am: c68f5313a2

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de
2018-08-17 01:48:48 -07:00
Colin Cross
74835a2a4f Convert frameworks-base-testutils to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I2d70f7c017fc3d181c70b030e39e5a932d0996cc
2018-08-16 22:25:40 -07:00
Remi NGUYEN VAN
a8e9090cf6 Fix testRegisterUsageCallback failure in setUp
LocalServices.addService in NetworkStatsService is currently failing
with IllegalStateException "Overriding service registration". Setting up
LocalServices in the test to avoid this issue might be possible, but
moving the registration to the only non-test caller of that constructor
as done here solves the issue and avoids side-effects from a constructor.

Test: atest FrameworksNetTests does not choke on this test
Bug: b/78487385
Bug: b/80082746
Change-Id: I5dba98fc79aec0800c8b71e6c7e23d1cfbcae852
Merged-In: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0
(Clean cherry-pick of go/ag/4061255)
2018-08-14 18:14:09 +09:00
Remi NGUYEN VAN
fb9247e38d Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c
am: a96779b592

Change-Id: I781053bcceb117f3d83950a5ee477b766bb7e314
2018-08-08 11:57:20 -07:00
Remi NGUYEN VAN
238f479b66 Merge "Add tests for NetworkMonitor isCaptivePortal" am: 97ff63812c
am: aebb44fd8e

Change-Id: Ieba6ed270bce8ef5051ee34dc39695d56bda903f
2018-08-08 11:42:53 -07:00
Remi NGUYEN VAN
76f081be5c Merge "Add codewiz@, reminv@ to OWNERS for connectivity" 2018-08-08 08:05:20 +00:00
Remi NGUYEN VAN
97ff63812c Merge "Add tests for NetworkMonitor isCaptivePortal" 2018-08-08 04:59:12 +00:00
Remi NGUYEN VAN
d2cb322e93 Add codewiz@, reminv@ to OWNERS for connectivity
Test: m
Change-Id: I11df4c93ac61b620fc576a2ff17192b7c9ecb984
2018-08-08 12:22:20 +09:00
Remi NGUYEN VAN
d9a1cd7fc5 Add tests for NetworkMonitor isCaptivePortal
Bug: b/79499239
Test: added tests, ConnectivityService tests pass

Change-Id: I98d503b8f92d7f35e59dd1621a90f2eca8c7a63c
2018-08-07 08:57:35 +00:00
Remi NGUYEN VAN
004c3347ad Merge "Add utils to convert Inet4Address <-> int" am: 5caebe3415
am: 2595e68176

Change-Id: Ia6830f33233210ea12816d6f099300231a7f9f6b
2018-08-06 12:09:31 -07:00
Remi NGUYEN VAN
2595e68176 Merge "Add utils to convert Inet4Address <-> int"
am: 5caebe3415

Change-Id: I347d23f4682eca623e3b10f72bc9000b1c5954a3
2018-08-06 09:34:55 -07:00
Remi NGUYEN VAN
5caebe3415 Merge "Add utils to convert Inet4Address <-> int" 2018-08-06 05:49:52 +00:00
Remi NGUYEN VAN
0066bda4cf 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
2018-08-03 15:55:24 +09:00
Remi NGUYEN VAN
2eb9f746cf Merge "Increase network request timeouts" am: 527c79d96d
am: 8b894a7d50

Change-Id: I1f0840a3fec3605e51942e8bc0debb954fd571d5
2018-07-27 06:16:50 -07:00
Remi NGUYEN VAN
8b894a7d50 Merge "Increase network request timeouts"
am: 527c79d96d

Change-Id: Iaae31d7eaa5e5ccccdcf63ba39dd3fdc729161a5
2018-07-27 06:08:08 -07:00
Treehugger Robot
527c79d96d Merge "Increase network request timeouts" 2018-07-27 11:56:31 +00:00
Remi NGUYEN VAN
2b61800bfe Merge "Increase IpClientTest verification timeout" am: 0cbdca3e20
am: 98e2f04ec0

Change-Id: I369c6f2865357259adb3bac8dad966734f021072
2018-07-27 03:11:50 -07:00
Remi NGUYEN VAN
98e2f04ec0 Merge "Increase IpClientTest verification timeout"
am: 0cbdca3e20

Change-Id: I214df25ed178d859ae60d765c94fc9d6a25408ee
2018-07-27 02:11:47 -07:00
Remi NGUYEN VAN
0cbdca3e20 Merge "Increase IpClientTest verification timeout" 2018-07-27 08:08:16 +00:00
Remi NGUYEN VAN
617b89e4e7 Merge "Use timeout consts in all ConnService tests" am: 3fbbe73437
am: 589432e728

Change-Id: I3d4a35aa3b78b455fe527c686b1a5cb2573ba47a
2018-07-27 00:20:07 -07:00
Remi NGUYEN VAN
589432e728 Merge "Use timeout consts in all ConnService tests"
am: 3fbbe73437

Change-Id: Ie62b9893c5b5f4e7b24197c1308d33e06a6c8f71
2018-07-27 00:11:06 -07:00
Remi NGUYEN VAN
4cb8062e34 Increase network request timeouts
With recent performance degradations on apct, the current timeouts are
too short and some requests trigger onUnavailable() before networks are
validated.

Test: runtest -x ConnectivityServiceTest.java
Bug: b/111778226
Change-Id: I083f529787f108065637a0aff3e5bb88e05e6510
2018-07-27 15:37:13 +09:00
Remi NGUYEN VAN
01a34ac642 Increase IpClientTest verification timeout
apct runs have become significantly slower, which makes some of these
tests flaky. Increase the timeout as a first measure to avoid flakes.

Bug: b/111819270
Test: runtest -x IpClientTest.java
Change-Id: Ifb0091377f311b67ba3a4f9324ce1e8cfb421ea3
2018-07-27 12:52:28 +09:00
Remi NGUYEN VAN
a7376ac0f7 Use timeout consts in all ConnService tests
Fix some timeouts that were forgotten in parent CL.

Bug: b/111778226
Test: runtest --no-hidden-api-checks -x ConnectivityServiceTest.java
Change-Id: Ib848eaba8c69c07ac596aa4386a741c9a2a87fc9
2018-07-27 11:47:25 +09:00
Remi NGUYEN VAN
9e95f67b19 Merge "Increase linger delay and test callback timeout" am: 716c04b29a
am: b70a230584

Change-Id: I22afb23e4ca6b9bf67a4a614c5fdc02852f29464
2018-07-26 04:20:23 -07:00
Remi NGUYEN VAN
b70a230584 Merge "Increase linger delay and test callback timeout"
am: 716c04b29a

Change-Id: I088de7dae4191a65e75feb9e071dcf18c30dcf21
2018-07-26 04:10:02 -07:00
Remi NGUYEN VAN
ef8377dba2 Increase linger delay and test callback timeout
Tests appear to have become much slower on apct in recent runs, although
local runs do not seem to be affected. As a first measure, increase our
timeouts to eliminate flakyness.

Bug: b/111778226
Test: runtest --no-hidden-api-checks -x ConnectivityServiceTest.java
Change-Id: I7a3bfb646eb554bcd9d50d026142f2a2cff74beb
2018-07-26 16:43:58 +09:00
Remi NGUYEN VAN
d2339214eb Merge "Increase TEST_LINGER_DELAY_MS" am: 9a783699cc
am: 93c22129e2

Change-Id: I88d46b9fc0c3fddb02671a2c4875afbf151f8f84
2018-07-24 22:19:38 -07:00
Remi NGUYEN VAN
43e50c21b6 Merge "Remove test dependency on ubsan runtime" am: c77d25e441
am: 0519a19f48

Change-Id: I164df38c2be8395589499939376de00f3bade7d3
2018-07-24 22:05:58 -07:00
Remi NGUYEN VAN
93c22129e2 Merge "Increase TEST_LINGER_DELAY_MS"
am: 9a783699cc

Change-Id: Iff68ee39ead571293877464c03ab98ab594dfcca
2018-07-24 22:05:37 -07:00
Remi NGUYEN VAN
0519a19f48 Merge "Remove test dependency on ubsan runtime"
am: c77d25e441

Change-Id: Icce8b11f2a1c380c899ebaac52ac4b2c427492c9
2018-07-24 21:57:42 -07:00
Remi NGUYEN VAN
9a783699cc Merge "Increase TEST_LINGER_DELAY_MS" 2018-07-25 03:08:48 +00:00
Remi NGUYEN VAN
c77d25e441 Merge "Remove test dependency on ubsan runtime" 2018-07-25 02:28:21 +00:00
Remi NGUYEN VAN
f6b73b2349 Remove test dependency on ubsan runtime
Requirement for this dependency was removed in aosp/696863.

Bug: b/79785496
Test: runtest frameworks-net (aosp), atest FrameworksNetTests
Change-Id: I14bb65c8f0a9b55aeae6376ff04ce18be7dc7f22
2018-07-24 11:28:29 +09:00
Remi NGUYEN VAN
605f12d6a5 Increase TEST_LINGER_DELAY_MS
The current timeout is short enough that lingered networks are torn down
before assertions can be run, causing flakyness in testMultipleLingering.
This CL sets the timeout to 300 in that particular test.

Verified that 300ms is enough with 500 successful runs on Sailfish.

An alternative would be to mock firing of the lingering timer, but
keeping the WakeupMessage logic realistic has already proven useful in
detecting races.

Bug: b/110673602
Test: runtest --no-hidden-api-checks frameworks-net
Change-Id: I6f9a656190bcff0b071ae2584d0f5fa74158472b
2018-07-19 17:12:38 +09:00
Mark Chien
cd70c87c65 Merge "Remove SimChangeListener from Tethering" am: 6e35b2c596
am: fbab182f44

Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9
2018-07-17 00:21:09 -07:00
Mark Chien
fbab182f44 Merge "Remove SimChangeListener from Tethering"
am: 6e35b2c596

Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
2018-07-17 00:10:56 -07:00
markchien
1d64e03f91 Remove SimChangeListener from Tethering
SimChangeListener is obsolete. It is replace by
ACTION_CARRIER_CONFIG_CHANGED.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes (with --no-hidden-api-checks)
    - tethering/hotspot on/off
Bug: 111490073

Change-Id: I82644ea136f43869a953a1f7b72dc489fe90f380
2018-07-16 19:54:26 +08:00
Jason Monk
a66cf9ce0c Merge "Fix leak where system held onto slice providers" into pi-dev
am: a2b1e5f013

Change-Id: I09ba87cf5c1f1a0099119a015fdd113a3da2375c
2018-07-09 18:03:47 -07:00
Jason Monk
c2eca4758b Fix leak where system held onto slice providers
Test: uiservicestests
Bug: 110985973
Change-Id: Ie8fab3c7b8c22d302825fb147d2c3468f9ae7172
(cherry picked from commit e1c0c2cb8d)
2018-07-03 17:42:05 +00:00
Carmen Jackson
b6d12b8bb1 Merge "Add in-app tracepoints to TouchLatency app."
am: 674fd12278

Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf
2018-07-02 17:57:29 -07:00
Carmen Jackson
286cfb1bba Add in-app tracepoints to TouchLatency app.
Test: Traced the TouchLatency app and saw the added tracepoints.
Change-Id: I72ab8f88731e635f98831f045dddd086a05acc3b
2018-07-02 14:40:23 -07:00
Remi NGUYEN VAN
855f0f03e1 Merge "Disable hidden API checks on unit tests" 2018-06-29 02:15:47 +00:00
Erik Kline
fc1bde9261 Merge "Prefer default Internet network for upstream tethering."
am: 3580a6a996

Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
2018-06-25 06:24:22 -07:00
Erik Kline
72302908d4 Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net
    - tethered via mobile, joined captive portal network, maintained
      laptop access via mobile until captive passed (then used wifi)
    - disabled client mode wifi, disabled mobile data, plugged in
      ethernet adapter, observed connectivity via ethernet
Bug: 32163131
Bug: 62648872
Bug: 63282480
Bug: 109786760
Bug: 110118584
Bug: 110260419
Merged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
Merged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
(cherry picked from commit 4080a1bd15)
2018-06-25 19:25:17 +09:00