Commit Graph

4936 Commits

Author SHA1 Message Date
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
Lorenzo Colitti
078049e316 Merge "Actually @hide unwanted capability methods." into pi-dev 2018-04-24 21:20:25 +00:00
Chalard Jean
fb0cb5fc65 Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
2018-04-24 03:02:11 -07:00
Chalard Jean
d9605fb13f 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
Chalard Jean
bc6af66da8 Add tests for getActiveNetwork.
Bug: 77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
2018-04-24 15:23:28 +09:00
Lorenzo Colitti
bec4200e1e Actually @hide unwanted capability methods.
Bug: 77601789
Test: builds, boots
Test: make doc-comment-check-docs
Change-Id: I7a913b83ab5110047d187564b3a1b0bbe1631942
2018-04-24 13:12:56 +09:00
Chalard Jean
fba9cb1fb9 Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
am: 2a915264a6

Change-Id: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
2018-04-23 00:33:21 -07:00
Chalard Jean
127064568f Let DnsManager fill in LinkProperties for private DNSes
Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
2018-04-23 13:58:42 +09:00
Chalard Jean
98d4e9d1c6 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am: f12a2130a4

Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
2018-04-20 04:49:43 -07:00
Chalard Jean
9ea008ff62 Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
2018-04-20 16:48:43 +09:00
Jeff Sharkey
04aa1ff87a Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
am: 629091d727

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
2018-04-16 10:19:39 -07:00
Jeff Sharkey
8708f5a0b5 Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
am: 7f11c98a55

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded
2018-04-16 10:07:52 -07:00
Jeff Sharkey
629091d727 Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev 2018-04-16 16:54:32 +00:00
Jeff Sharkey
33a25ec466 Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
This reverts commit 4de48809c0.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing
2018-04-16 16:50:34 +00:00
Jeff Sharkey
7f11c98a55 Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev 2018-04-16 16:50:06 +00:00
Jeff Sharkey
4de48809c0 Revert "OP_GET_USAGE_STATS should be noted, not checked."
This reverts commit fbb37a7f61.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
2018-04-16 16:39:55 +00:00
Chalard Jean
c8c0cf9afc Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
am: a7579d6325

Change-Id: Iba59e93875c28b8e30db0c013575bc2f117cb16c
2018-04-15 22:48:50 -07:00
Chalard Jean
7ee42930c1 Guard the SSID with NETWORK_SETTINGS
Bug: 77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504
2018-04-16 13:29:22 +09:00
Jeff Sharkey
876c34224d Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
am: 64bbb2014e

Change-Id: I38f5aecdb94c8b886ca4eba5908ab1b4a9c1fb89
2018-04-14 18:11:58 -07:00