LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,919 Commits 2 Branches 0 Tags
8f22123764d9df002b57d7feca7c06b59f56c33e
Commit Graph

4919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jeff Sharkey
fbb37a7f61 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
94438f59a3 Merge "Notif manager and captive portal app to read SSID again" into pi-dev 
am: ce8338b0b2

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

Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
 2018-04-13 02:14:02 -07:00
TreeHugger Robot
53d1a8d88d Merge "Add a new ssid field in NetworkCapabilities." into pi-dev 2018-04-13 08:59:23 +00:00
Chalard Jean
4cd4fa3f83 Notif manager and captive portal app to read SSID again 
Bug: 77114259
Test: frameworks-net pass
      manual test shows the SSID is now displayed again

Change-Id: I5cb2b4777ad78d972031e8f2ff22e2155f4ab894
 2018-04-13 15:38:36 +09:00
Chalard Jean
058cd31b1b Add a new ssid field in NetworkCapabilities. 
Bug: 77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163
 2018-04-13 15:38:35 +09:00
Jeff Sharkey
83b5faff66 Merge "APIs to disable data usage notifications." into pi-dev 
am: 47fe228875

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
 2018-04-11 16:14:26 -07:00
TreeHugger Robot
47fe228875 Merge "APIs to disable data usage notifications." into pi-dev 2018-04-11 23:05:03 +00:00
Jeff Sharkey
cad3dd0b70 APIs to disable data usage notifications. 
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis.  (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active.  Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
 2018-04-11 22:07:40 +00:00
Pavel Maltsev
20b5fb8c6f Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev 
am: 991c6154a6

Change-Id: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
 2018-04-10 20:58:01 -07:00
Remi NGUYEN VAN
9f4c89d433 Merge "Added tests for MultipathPolicyTracker." into pi-dev 
am: 471d6f0465

Change-Id: I2f47dd30f44722a0611967ce5375aa164f40c718
 2018-04-10 20:37:06 -07:00
TreeHugger Robot
991c6154a6 Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev 2018-04-11 03:26:22 +00:00
Remi NGUYEN VAN
471d6f0465 Merge "Added tests for MultipathPolicyTracker." into pi-dev 2018-04-11 02:53:14 +00:00
dalyk
bd8029c3a2 [automerger skipped] Merge "Trigger NetworkCallback events when private DNS usage has changed." into pi-dev 
am: 55c022b2a5  -s ours

Change-Id: I1410526ef303ba6e69b32a76db534f0ca59840ed
 2018-04-10 00:51:28 -07:00
TreeHugger Robot
55c022b2a5 Merge "Trigger NetworkCallback events when private DNS usage has changed." into pi-dev 2018-04-10 07:38:21 +00:00
Remi NGUYEN VAN
abdb6e76b2 Added tests for MultipathPolicyTracker. 
Test: atest com.android.server.connectivity.MultipathPolicyTrackerTest
Bug: b/72631572
Bug: b/72877610
Change-Id: I33d9cd77948ff76008a125e4e2786fbbc2b03032
 2018-04-10 15:27:59 +09:00