LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,429 Commits 2 Branches 0 Tags
7e81ae73b4a72a5e5265987f29e2fd9863aa57cc
Commit Graph

5429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
android-build-team Robot
8d7c7fed46 Snap for 4739962 from d5a1bb621a05d414ed630643898f98081893f71b to pi-release 
Change-Id: I1f6271a48eebc519d5ee2bcbc23761954fe3af98
 2018-04-24 07:23:04 +00:00
Chalard Jean
fd424b90be Add tests for getActiveNetwork. 
Bug: 77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
 2018-04-24 15:23:28 +09:00
Lorenzo Colitti
88e7d8e3e5 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
89af2956e6 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
48bb49deff 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
android-build-team Robot
46de532631 Snap for 4736748 from e71fb69ec9551029959ae2cc75ca2de2a2be3652 to pi-release 
Change-Id: I079ed104b35b4d57aa5393980595e3827bf01939
 2018-04-22 07:23:51 +00:00
Chalard Jean
2cc723e410 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
3e0a46a439 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
android-build-team Robot
54b7c7f70f Snap for 4725392 from 34a0b18a5c730e4fa16e27c63ed0cd79a6df188e to pi-release 
Change-Id: Ifaf1b911565819b2bd1f466eaa61a1292868f497
 2018-04-17 07:22:21 +00:00
android-build-team Robot
55393189f1 Merge cherrypicks of [3907239, 3907816] into pi-release 
Change-Id: I90cbf2491df8c8606b9744aa732647ec26d3bddc
 2018-04-16 20:14:42 +00:00
Jeff Sharkey
d810e5e914 Revert "OP_GET_USAGE_STATS should be noted, not checked." 
This reverts commit b1296e58da.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
(cherry picked from commit d5992e681f)
 2018-04-16 20:14:24 +00:00
Jeff Sharkey
569e8c496b Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev 
am: 687ddf6928

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

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded
 2018-04-16 10:07:52 -07:00
Jeff Sharkey
687ddf6928 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
069002e639 Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked."" 
This reverts commit d5992e681f.

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
04efa57798 Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev 2018-04-16 16:50:06 +00:00
Jeff Sharkey
d5992e681f Revert "OP_GET_USAGE_STATS should be noted, not checked." 
This reverts commit b1296e58da.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
 2018-04-16 16:39:55 +00:00
android-build-team Robot
3e432468f4 Snap for 4723085 from a7579d632590457cb987f0199550ab4e25fb504d to pi-release 
Change-Id: If7b1c24a6f0c5a5a2a512197131a3612a42f3e72
 2018-04-16 07:27:35 +00:00
Chalard Jean
8325b84511 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
61da83e13d Guard the SSID with NETWORK_SETTINGS 
Bug: 77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504
 2018-04-16 13:29:22 +09:00
android-build-team Robot
b7cba28b00 Snap for 4722539 from 52842feb146cac0ee72d866b16a1ce8e3d8b5fdf to pi-release 
Change-Id: I946c5a19ade86c63ecf2c5c545bd8a754b5cc552
 2018-04-15 07:28:38 +00:00
Jeff Sharkey
cef9082b02 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
Jeff Sharkey
b1296e58da OP_GET_USAGE_STATS should be noted, not checked. 
Per email feedback, we should be using "noteOp" instead of "checkOp"
when testing if caller holds OP_GET_USAGE_STATS, so that we record
that caller used the operation.

Bug: 77662908
Test: builds, boots
Exempt-From-Owner-Approval: keep tests passing
Change-Id: I3a60345d590534fdbc2c1248e0d30dc85a5d6772
 2018-04-13 19:32:25 +00:00
Chalard Jean
6bac5da914 Merge "Notif manager and captive portal app to read SSID again" into pi-dev 
am: c32440ba66

Change-Id: I663a59ff2847a9f44ea1395326f6cb00e97237b6
 2018-04-13 04:52:08 -07:00
TreeHugger Robot
c32440ba66 Merge "Notif manager and captive portal app to read SSID again" into pi-dev 2018-04-13 11:41:32 +00:00
Chalard Jean
33ada883b8 Merge "Add a new ssid field in NetworkCapabilities." into pi-dev 
am: f920300665

Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
 2018-04-13 02:14:02 -07:00
TreeHugger Robot
f920300665 Merge "Add a new ssid field in NetworkCapabilities." into pi-dev 2018-04-13 08:59:23 +00:00