Commit Graph

4954 Commits

Author SHA1 Message Date
Chalard Jean
d116554847 Merge "Unify behavior of various cases of "no underlying networks"" into pi-dev
am: 468fdc3dd2

Change-Id: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003
2018-05-22 05:19:52 -07:00
Chalard Jean
d76c204ef2 Merge changes Ic8231b18,I30009f88 into pi-dev
am: 200cad09c7

Change-Id: I12c948ebeb2b74290908f8320ff77220dc4a9fb9
2018-05-22 04:06:35 -07:00
Chalard Jean
47a8ef0efd Unify behavior of various cases of "no underlying networks"
Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.

Bug: 79748782
Test: runtest frameworks-net
Change-Id: I51c3badde29f43f692f383553bd98327d2da8dd1
2018-05-22 18:50:00 +09:00
Chalard Jean
d2ee6cec35 Fix: VPNs update caps upon underlying network disconnect.
Bug: 79748782
Test: ConnectivityServiceTests still pass
Change-Id: Ic8231b18a17e6feb5ebafe8d5688fb59f9d4d58e
2018-05-22 18:49:58 +09:00
Chalard Jean
204a9c4f09 Add tests for setUnderlyingNetworks.
Fixes come later. This is complex enough as it is.

Bug: 79748782
Test: new test passes, old tests still pass
Change-Id: I30009f88e68a534c332ca88bae517cacc39a60bb
2018-05-22 18:25:33 +09:00
Remi NGUYEN VAN
c6bdd832c2 Merge "Move CaptivePortalProbeResult to its own file" into pi-dev
am: 21dc04f551

Change-Id: Ia48b32307a51a66f2672d7112f71166dd6db41b1
2018-05-22 01:09:08 -07:00
Chalard Jean
b03086e9ef Merge "Fix setCapabilities." into pi-dev
am: 7c65d9f23d

Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
2018-05-22 01:01:39 -07:00
Remi NGUYEN VAN
21dc04f551 Merge "Move CaptivePortalProbeResult to its own file" into pi-dev 2018-05-22 08:00:56 +00:00
Chalard Jean
7c65d9f23d Merge "Fix setCapabilities." into pi-dev 2018-05-22 07:51:09 +00:00
Remi NGUYEN VAN
f8daa30ba9 Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.

Bug: b/79499239
Test: runtest frameworks-net
Change-Id: I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299
2018-05-22 10:00:28 +09:00
Bernie Innocenti
56691784b8 [automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: 36df67475e  -s ours

Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623
2018-05-21 10:32:00 -07:00
Bernie Innocenti
36df67475e Merge changes from topic "apf-read-ram"
am: b5dda0e316

Change-Id: I80d70e5bce6d1a0903599e98d2d251459df1292a
2018-05-21 09:40:29 -07:00
Chalard Jean
c5c02585f5 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
2018-05-21 14:46:40 +09:00
Erik Kline
51ae4f3c79 Merge "Add explicit override for default Private DNS mode" into pi-dev
am: 2b3c858296

Change-Id: If480ab40c7cf9ab75c52feafc28338a049cbceef
2018-05-18 01:08:26 -07:00
Erik Kline
ae1a3af6ce Add explicit override for default Private DNS mode
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 79719289
Change-Id: I943c5476666e47d04690626e2133f501cb875b46
2018-05-17 17:41:12 +09:00
Jeff Sharkey
9abab6e64d Merge "Let tests enumerate all transports/capabilities." into pi-dev
am: 8e6445a1a5

Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
2018-05-15 08:27:40 -07:00
Bernie Innocenti
62f1e1f66c apf: Add counters for dropped / passed packets
ApfFilter maintains separate counters for each reason why a packet was
passed or dropped by the filter logic.

There's also a total which should match the individual counters,
*unless* the APF interpreter aborted execution early due to an illegal
instruction or an out-of-bounds access.

Test: both on APFv2 and APFv4-capable device:
	runtest -x tests/net/java/android/net/ip/IpClientTest.java
	runtest -x tests/net/java/android/net/apf/ApfTest.java
	manual tests connected to an AP
Bug: 73804303
Change-Id: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
Merged-In: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
(cherry picked from commit e53225a4ff)
2018-05-15 14:21:54 +09:00
Jeff Sharkey
93bf1bfda3 Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.

Bug: 16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: I35ca412512dc8515b44d5518e1ca4caa5bdc678f
2018-05-14 17:17:33 -06:00
Chalard Jean
8826300969 Merge "Fix SSID not being logged by the validation logs" into pi-dev
am: 322d916195

Change-Id: I8bdd4a020e9d04f46847ef3c7e80ccf5c5cd19ea
2018-05-09 23:07:34 -07:00
Chalard Jean
df2478ad15 Fix SSID not being logged by the validation logs
Also add it in the logs of the notification manager.

Bug: 78547904
Test: manual
Change-Id: I262e65efadb00e1efce5056771978053f304ca6f
2018-05-09 18:11:10 +09:00
Remi NGUYEN VAN
53ecdf5876 Merge "Fix testRegisterUsageCallback" am: b583c2c911
am: f5242645f6

Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
2018-05-08 02:13:00 -07:00
Remi NGUYEN VAN
f5242645f6 Merge "Fix testRegisterUsageCallback"
am: b583c2c911

Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
2018-05-08 02:00:59 -07:00
Remi NGUYEN VAN
b583c2c911 Merge "Fix testRegisterUsageCallback" 2018-05-08 07:55:42 +00:00
Erik Kline
f5eabad649 [automerger skipped] Merge "Add static IpClient logging" am: 44ba707b24
am: 2997b0da79  -s ours

Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76
2018-05-03 05:15:34 -07:00
Erik Kline
2997b0da79 Merge "Add static IpClient logging"
am: 44ba707b24

Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
2018-05-03 05:05:05 -07:00
Erik Kline
44ba707b24 Merge "Add static IpClient logging" 2018-05-03 10:44:30 +00:00
Erik Kline
fa7e253828 Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys.  Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.

Bug: 62476366
Bug: 77999594
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit 0613af7a7f)
2018-05-03 18:00:09 +09:00
android-build-team Robot
7f0be081ad Merge "Add static IpClient logging" into pi-dev
am: 0341279483

Change-Id: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
2018-05-03 01:30:22 -07:00
android-build-team Robot
0341279483 Merge "Add static IpClient logging" into pi-dev 2018-05-03 08:19:43 +00:00
android-build-team Robot
9a1892b0d5 [automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev
am: 2a2480a824  -s ours

Change-Id: Ia25540fd865f6040e2a5d943c19b2a12965c4d5b
2018-05-02 12:42:24 -07:00
Chenbo Feng
b857838e09 [automerger skipped] Remove the unused file parsing function
am: 998ea37b66  -s ours

Change-Id: I264e9826246ebfc74cf74f8af623a428909a56e3
2018-05-02 12:32:53 -07:00
android-build-team Robot
2a2480a824 Merge changes from topic "ifaceStatsDetail" into pi-dev
* changes:
  Remove the unused file parsing function
  Use eBPF map data for per iface stats
2018-05-02 19:17:27 +00:00
Erik Kline
0613af7a7f Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys.  Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.

Bug: 62476366
Bug: 77999594
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - dumpsys connmetrics [ipclient] works
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
2018-05-02 21:53:17 +09:00
Remi NGUYEN VAN
34f851a5e3 Fix testRegisterUsageCallback
noteOp (introduced in go/ag/3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.

The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/78487385
2018-05-02 16:51:13 +09:00
android-build-prod (mdb)
8f22123764 Merge changes from topic "ifaceStats" am: dfd8e7ffff
am: da795087a6

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6
2018-05-01 19:53:30 -07:00
Chenbo Feng
998ea37b66 Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
Merged-In: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
(cherry picked from aosp commit 6a2a9c93b0)
2018-05-01 19:48:03 -07:00
android-build-prod (mdb)
da795087a6 Merge changes from topic "ifaceStats"
am: dfd8e7ffff

Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
2018-05-01 19:41:39 -07:00
android-build-prod (mdb)
dfd8e7ffff Merge changes from topic "ifaceStats"
* changes:
  Remove the unused file parsing function
  Use eBPF map data for per iface stats
2018-05-02 01:19:23 +00:00
Chenbo Feng
6a2a9c93b0 Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
2018-05-01 14:13:55 -07:00
Chalard Jean
916a7657ae [automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 436d7c53be
am: d00fc783ba  -s ours

Change-Id: I7a0f888a7f5f0e7424f6ad01fe155bbe48089b87
2018-05-01 02:12:52 -07:00
Chalard Jean
d00fc783ba Merge "Let DnsManager fill in LinkProperties for private DNSes"
am: 436d7c53be

Change-Id: Icd79a15c573a3bc2f371d724081e296eca2b236f
2018-04-30 21:17:21 -07:00
Chalard Jean
436d7c53be Merge "Let DnsManager fill in LinkProperties for private DNSes" 2018-05-01 03:07:35 +00:00
Bernie Innocenti
74b0582864 Merge "apf: Add counters for dropped / passed packets" into pi-dev
am: d11d7ff8a0

Change-Id: Iaec1efa4e827eac986049ddbb440e2a4824a673b
2018-04-27 10:17:53 -07:00
Bernie Innocenti
e53225a4ff apf: Add counters for dropped / passed packets
ApfFilter maintains separate counters for each reason why a packet was
passed or dropped by the filter logic.

There's also a total which should match the individual counters,
*unless* the APF interpreter aborted execution early due to an illegal
instruction or an out-of-bounds access.

Test: both on APFv2 and APFv4-capable device:
	runtest -x tests/net/java/android/net/ip/IpClientTest.java
	runtest -x tests/net/java/android/net/apf/ApfTest.java
	manual tests connected to an AP
Bug: 73804303
Change-Id: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
2018-04-27 23:30:23 +09:00
android-build-prod (mdb)
81fb01eb60 [automerger skipped] Merge "Add the list of private DNS addresses to LinkProperties" am: cc6f129fa9
am: 69dcf15f47  -s ours

Change-Id: I2047d201764bb0451c323d644b3c85e033f3067a
2018-04-27 01:06:20 -07:00
android-build-prod (mdb)
69dcf15f47 Merge "Add the list of private DNS addresses to LinkProperties"
am: cc6f129fa9

Change-Id: I76ec108862edfb557496ddcd8b5c73202cd674de
2018-04-27 00:56:10 -07:00
android-build-prod (mdb)
cc6f129fa9 Merge "Add the list of private DNS addresses to LinkProperties" 2018-04-27 04:53:52 +00:00
Chalard Jean
112bf112f3 Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/3880157)

Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
2018-04-27 13:32:10 +09:00
Chalard Jean
abc68d5552 Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/3874803)

Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-27 13:32:10 +09:00
Lorenzo Colitti
8ce17c4995 Merge "Actually @hide unwanted capability methods." into pi-dev
am: 078049e316

Change-Id: I80a88123b16c54734306da7e5dc0670972041648
2018-04-24 14:43:06 -07:00