Commit Graph

5656 Commits

Author SHA1 Message Date
Bernie Innocenti
4c10a834f1 [automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: e9c2a1aa3d  -s ours

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

Change-Id: I80d70e5bce6d1a0903599e98d2d251459df1292a
2018-05-21 09:40:29 -07:00
Chalard Jean
e15627ef72 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
android-build-team Robot
b3eae29c2e Snap for 4793185 from 915e94484b73d5184ccd0e8d4f58e16b973e5b3b to pi-release
Change-Id: Ic8c5947927774388a5fbcd6923bbdbcc631610c1
2018-05-20 07:21:16 +00:00
Erik Kline
0e5c8f2092 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
a7edf6ff56 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
android-build-team Robot
121364aa82 Snap for 4784261 from 037834d55772403be181cac74e8d806aa3385ddc to pi-release
Change-Id: If699bf35aa77c7c0aeca814b9c02cf155159fa69
2018-05-16 07:24:30 +00:00
Jeff Sharkey
eb25084c11 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
4d93537e9a 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 f1089bfa95)
2018-05-15 14:21:54 +09:00
Jeff Sharkey
7b6ed22507 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
android-build-team Robot
d04b401d1f Snap for 4773106 from 98451417018a312251b6267c42236c3802f45812 to pi-release
Change-Id: I0170c5b3f8940e2956242ef5f527a54b74567b6a
2018-05-10 07:26:53 +00:00
Chalard Jean
a642bf55db 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
f2da177b59 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
80770e423c Merge "Fix testRegisterUsageCallback" am: 899283d833
am: bc3a7a5ba5

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

Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
2018-05-08 02:00:59 -07:00
Remi NGUYEN VAN
899283d833 Merge "Fix testRegisterUsageCallback" 2018-05-08 07:55:42 +00:00
android-build-team Robot
bff9864dd7 Snap for 4765094 from f7416d1fe0f906d7bec1db767de2ab1ec4bb1026 to pi-release
Change-Id: Ie3108009fb6c7c946de546362c2f6ca7713f016d
2018-05-06 07:26:32 +00:00
Erik Kline
d221c95c92 [automerger skipped] Merge "Add static IpClient logging" am: 3f966e9c62
am: 946050d3fd  -s ours

Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76
2018-05-03 05:15:34 -07:00
Erik Kline
946050d3fd Merge "Add static IpClient logging"
am: 3f966e9c62

Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
2018-05-03 05:05:05 -07:00
Erik Kline
3f966e9c62 Merge "Add static IpClient logging" 2018-05-03 10:44:30 +00:00
Erik Kline
d1de8fb748 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 78b85e6ca3)
2018-05-03 18:00:09 +09:00
android-build-team Robot
79e87de9e2 Merge "Add static IpClient logging" into pi-dev
am: 8c9396a826

Change-Id: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
2018-05-03 01:30:22 -07:00
android-build-team Robot
8c9396a826 Merge "Add static IpClient logging" into pi-dev 2018-05-03 08:19:43 +00:00
android-build-team Robot
7e16831395 Snap for 4759746 from 49a987c277b8644f81c53defbc7ff8c2a950ba28 to pi-release
Change-Id: I4dd0e1b090acebe52adbe7c57d9ea63772a2fe91
2018-05-03 07:21:04 +00:00
android-build-team Robot
20fe0c37a1 [automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev
am: 24596473b7  -s ours

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

Change-Id: I264e9826246ebfc74cf74f8af623a428909a56e3
2018-05-02 12:32:53 -07:00
android-build-team Robot
24596473b7 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
78b85e6ca3 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
b1ff5a381e 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)
feed20b4e9 Merge changes from topic "ifaceStats" am: 3f675c25e0
am: 7df94359d4

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6
2018-05-01 19:53:30 -07:00
Chenbo Feng
cf7567ba7a 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 b815c978b81eee4b1494bd0b9d25bfad52f08b72)
2018-05-01 19:48:03 -07:00
android-build-prod (mdb)
7df94359d4 Merge changes from topic "ifaceStats"
am: 3f675c25e0

Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
2018-05-01 19:41:39 -07:00
android-build-prod (mdb)
3f675c25e0 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
84c1437111 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
a7e19aace2 [automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 6b5358f16e
am: 6bbbb06bc7  -s ours

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

Change-Id: Icd79a15c573a3bc2f371d724081e296eca2b236f
2018-04-30 21:17:21 -07:00
Chalard Jean
6b5358f16e Merge "Let DnsManager fill in LinkProperties for private DNSes" 2018-05-01 03:07:35 +00:00
android-build-team Robot
88c797787b Snap for 4751833 from 8f5b3f19b4b10a55e283c48ba64261e1f33c9b0c to pi-release
Change-Id: I049ecf5ab302a6bef275210404b9119be9ceb328
2018-04-29 07:22:11 +00:00
Bernie Innocenti
24e1788f25 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
f1089bfa95 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)
34ef276833 [automerger skipped] Merge "Add the list of private DNS addresses to LinkProperties" am: e010528218
am: 3808f3ecf5  -s ours

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

Change-Id: I76ec108862edfb557496ddcd8b5c73202cd674de
2018-04-27 00:56:10 -07:00
android-build-prod (mdb)
e010528218 Merge "Add the list of private DNS addresses to LinkProperties" 2018-04-27 04:53:52 +00:00
Chalard Jean
70be7a9dd0 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
299d856143 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
android-build-team Robot
b12202bda9 Snap for 4742838 from 728cb519a5c734af0b7befa52d803d9d090a20aa to pi-release
Change-Id: I41c109022b915f160a4971c66eb9fd171d64a8a8
2018-04-25 07:25:44 +00:00
Lorenzo Colitti
8e28cb01c4 Merge "Actually @hide unwanted capability methods." into pi-dev
am: 9d64b6e6b2

Change-Id: I80a88123b16c54734306da7e5dc0670972041648
2018-04-24 14:43:06 -07:00
Lorenzo Colitti
9d64b6e6b2 Merge "Actually @hide unwanted capability methods." into pi-dev 2018-04-24 21:20:25 +00:00
Chalard Jean
6093933b48 Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
2018-04-24 03:02:11 -07:00
Chalard Jean
46adcf3089 Make sure getActiveNetwork is consistent with default callbacks
Bug: 77737389
Test: runtest framework-net
      new test don't pass without the main code change, but they
      do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
2018-04-24 17:32:00 +09:00