Commit Graph

5104 Commits

Author SHA1 Message Date
Erik Kline
c59cbe8565 Merge "Remove ResolveUtil from frameworks/base callers"
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1
2018-08-28 20:12:49 -07:00
Erik Kline
f2420790ac Remove ResolveUtil from frameworks/base callers
Use the Private DNS bypass logic that was moved into Network.

Once all callers of ResolvUtil are updated to use this interface
ResolvUtil can be deleted.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connection to captive portal network detects portal correctly
      and the login activity functions as expected

Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Change-Id: If11ef2b5ffdc729f8449cf18dccd5f1eccbc51e6
2018-08-28 12:59:21 +09:00
Blake Lawson
984d4edfa4 Merge "Fix typo in IpConfiguration comment"
am: 502e5b1aa2

Change-Id: Ife540b3bda671dcb8016dae86f221a62063bd464
2018-08-23 21:08:12 -07:00
Treehugger Robot
502e5b1aa2 Merge "Fix typo in IpConfiguration comment" 2018-08-24 03:43:38 +00:00
Remi NGUYEN VAN
173c851f66 Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
am: e01b4ce6c7

Change-Id: I1800eb214d501e76b8705a27ca817000d009736e
2018-08-23 20:33:45 -07:00
Blake Lawson
f134e62f73 Fix typo in IpConfiguration comment
Bug: NONE
Test: NONE
Change-Id: Ib2ce166532292266da17ec85c16e400afe4f9111
2018-08-23 08:43:07 -07:00
Remi NGUYEN VAN
041ac7ed06 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
eb03f35534 Add util to add an ARP table entry
This is to be used by the new DhcpServer to add ARP entries with new
addresses before sending unicast responses.

Test: manual: cat /proc/net/arp with implementation based on this
Bug: b/109584964
Change-Id: I3559893583aa3c49b188ad689a41ee2f3e9d9bf3
2018-08-23 16:01:44 +09:00
Remi NGUYEN VAN
c581541255 Merge "Fix testRegisterUsageCallback failure in setUp"
am: e873a53af1

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de
2018-08-17 01:48:48 -07:00
Remi NGUYEN VAN
e873a53af1 Merge "Fix testRegisterUsageCallback failure in setUp" 2018-08-17 01:51:10 +00:00
Mathew Inwood
39c31ebfb2 Merge "Add @UnsupportedAppUsage annotations"
am: d717c04b12

Change-Id: I8f8c9106b494caa6dc5ad405111f2a285a01e49f
2018-08-15 10:12:01 -07:00
Mathew Inwood
0b8f861d07 Add @UnsupportedAppUsage annotations
For packages:
  android.net.wimax
  android.net.wifi.p2p.nsd
  android.net.wifi.p2p
  android.net.wifi.hotspot2.pps
  android.net.wifi.hotspot2.omadm
  android.net.wifi.hotspot2
  android.net.wifi.aware
  android.net.wifi
  android.net.util
  android.net.sip
  android.net.rtp
  android.net.nsd
  android.net.metrics
  android.net.lowpan
  android.net.http
  android.net.captiveportal
  android.net

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: Ie25423113ee1a8071cd5039382c00de6ce0af7fd
Merged-In: I520be7a4c79e68310c12e4f55bf66acaa94145a1
2018-08-14 14:44:29 +01:00
Remi NGUYEN VAN
6e025c05fe 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
Xin Li
19b7fb054c Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: I1ba00379ca307f44a6430e516b474983e4c1dd32
2018-08-13 13:01:08 -07:00
Treehugger Robot
e6d745c6f8 Merge "NetworkAgent: Send primitive integer in explicitlySelected" 2018-08-13 17:09:51 +00:00
Roshan Pius
f89a482aee Merge "NetworkAgent: Send primitive integer in score" am: 96da30f094
am: c039ad203e

Change-Id: I7f6ac7a5fd6ecae4ac077b7f54fe91879a63fa13
2018-08-10 08:54:21 -07:00
Roshan Pius
94f41e9c99 NetworkAgent: Send primitive integer in explicitlySelected
|Boolean| object is not parcelable and hences crashes when the binder call
crosses a process boundary. Using a primitive integer instead to
represent the boolean value.

Bug: 112358948
Test: Device boots up and able to make wifi connection.
Change-Id: Iac69fd302e1f1338ed0da1446105ffc5855451cc
2018-08-10 07:44:33 -07:00
Roshan Pius
96da30f094 Merge "NetworkAgent: Send primitive integer in score" 2018-08-10 14:33:07 +00:00
Roshan Pius
fb89c0a989 NetworkAgent: Send primitive integer in score
|Integer| is not parcelable and hences crashes when the binder call
crosses a process boundary. Using a primitive integer should suffice
for sending the value to the server. There are no other usage of
|EVENT_NETWORK_SCORE_CHANGED| in the codebase.

Bug: 112358948
Test: Device boots up and able to make wifi connection.
Change-Id: I4c8fc17f4b803f69a4d882c71a8ce014a194d1ba
2018-08-09 07:10:27 -07:00
Remi NGUYEN VAN
5e584e422d Merge "Add tests for NetworkMonitor isCaptivePortal" am: 4609bc8008
am: aebb44fd8e

Change-Id: Ieba6ed270bce8ef5051ee34dc39695d56bda903f
2018-08-08 11:42:53 -07:00
Remi NGUYEN VAN
4609bc8008 Merge "Add tests for NetworkMonitor isCaptivePortal" 2018-08-08 04:59:12 +00:00
Remi NGUYEN VAN
8598b2d8b0 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
328a0e5462 Merge "Add utils to convert Inet4Address <-> int" am: e2a7a7a666
am: 5a0999ed3f

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

Change-Id: I347d23f4682eca623e3b10f72bc9000b1c5954a3
2018-08-06 09:34:55 -07:00
Remi NGUYEN VAN
e2a7a7a666 Merge "Add utils to convert Inet4Address <-> int" 2018-08-06 05:49:52 +00:00
Remi NGUYEN VAN
eeb12208b3 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
Nathan Harold
1d4588aaaf Merge "Count and Report Bandwidth Requests by UID" am: e1d140619f
am: 77f5b8e1b1

Change-Id: I2c1bd77de350c27206c9809a628d6d4e0eacad2f
2018-08-01 16:08:34 -07:00
Nathan Harold
77f5b8e1b1 Merge "Count and Report Bandwidth Requests by UID"
am: e1d140619f

Change-Id: Iadfb7c04a49055c57cc8eed2ce9ad5f10e15cf52
2018-08-01 15:48:12 -07:00
Nathan Harold
6179b1451c Count and Report Bandwidth Requests by UID
To debug power drain due to modem wakeups,
one of the signals we'd like to track is
requests for bandwidth estimate to see which
apps are making requests and how often. This
patch keeps a simple count per-UID when an
app requests a bandwidth update, and that
count is made available in dumpsys.

Bug: 77498849
Test: runtest frameworks-net
Change-Id: I30d2ce85f9fa6747030cf4039d1080113a32e386
2018-07-31 02:37:38 +00:00
Remi NGUYEN VAN
1c413e33f8 Merge "Increase network request timeouts" am: 9ee086a4d5
am: 2ca2502e64

Change-Id: I1f0840a3fec3605e51942e8bc0debb954fd571d5
2018-07-27 06:16:50 -07:00
Remi NGUYEN VAN
2ca2502e64 Merge "Increase network request timeouts"
am: 9ee086a4d5

Change-Id: Iaae31d7eaa5e5ccccdcf63ba39dd3fdc729161a5
2018-07-27 06:08:08 -07:00
Treehugger Robot
9ee086a4d5 Merge "Increase network request timeouts" 2018-07-27 11:56:31 +00:00
Remi NGUYEN VAN
9460b182af Merge "Use timeout consts in all ConnService tests" am: d542ac7140
am: 0232f517d9

Change-Id: I3d4a35aa3b78b455fe527c686b1a5cb2573ba47a
2018-07-27 00:20:07 -07:00
Remi NGUYEN VAN
0232f517d9 Merge "Use timeout consts in all ConnService tests"
am: d542ac7140

Change-Id: Ie62b9893c5b5f4e7b24197c1308d33e06a6c8f71
2018-07-27 00:11:06 -07:00
Remi NGUYEN VAN
3d9871756b 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
d542ac7140 Merge "Use timeout consts in all ConnService tests" 2018-07-27 05:50:35 +00:00
Remi NGUYEN VAN
c1a9e598da 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
f6e1543f8c Merge "Increase linger delay and test callback timeout" am: ff9cfe36d3
am: 6f6fc2b758

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

Change-Id: I088de7dae4191a65e75feb9e071dcf18c30dcf21
2018-07-26 04:10:02 -07:00
Remi NGUYEN VAN
ff9cfe36d3 Merge "Increase linger delay and test callback timeout" 2018-07-26 09:54:03 +00:00
Remi NGUYEN VAN
eea4a45c1a 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
f082bd4bfb Merge "Increase TEST_LINGER_DELAY_MS" am: 9a783699cc
am: 6918e10bff

Change-Id: I88d46b9fc0c3fddb02671a2c4875afbf151f8f84
2018-07-24 22:19:38 -07:00
Remi NGUYEN VAN
6918e10bff Merge "Increase TEST_LINGER_DELAY_MS"
am: 9a783699cc

Change-Id: Iff68ee39ead571293877464c03ab98ab594dfcca
2018-07-24 22:05:37 -07:00
Remi NGUYEN VAN
23911d5907 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
Erik Kline
2e29a54890 Merge "Push DNS configuration on network validation" am: a5c5527aa2
am: 8f21278212

Change-Id: Ic2046e053faf58e2edf2824e01145c61a9f2991f
2018-07-03 03:19:32 -07:00
Erik Kline
8f21278212 Merge "Push DNS configuration on network validation"
am: a5c5527aa2

Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc
2018-07-03 03:09:16 -07:00
Treehugger Robot
a5c5527aa2 Merge "Push DNS configuration on network validation" 2018-07-03 09:03:35 +00:00
Erik Kline
e6d899ab4e Push DNS configuration on network validation
Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connected to captive portal network,
      saw failed validation attempt (opportunistic),
      passed portal, saw successful revalidation attempt
Bug: 64133961
Bug: 72344805
Bug: 109928338

Change-Id: I0471685c2234af8a8c7f5b2ad3205eb6e36333c5
2018-07-03 13:33:34 +09:00
Erik Kline
3b7869a829 [automerger skipped] Merge "Prefer default Internet network for upstream tethering." am: 2b39d6d2a0
am: 110b875969  -s ours

Change-Id: I965178ec99083dcd907841b4959e456f6d492516
2018-06-25 06:33:21 -07:00
Erik Kline
110b875969 Merge "Prefer default Internet network for upstream tethering."
am: 2b39d6d2a0

Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
2018-06-25 06:24:22 -07:00