Commit Graph

5464 Commits

Author SHA1 Message Date
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
Chalard Jean
7048e64ed1 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
3ec2c0fc84 Add a new ssid field in NetworkCapabilities.
Bug: 77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163
2018-04-13 15:38:35 +09:00
android-build-team Robot
e9cc69c87e Snap for 4716599 from 08d79be6bdd098a1adef6c3f707a4b8169f3ada2 to pi-release
Change-Id: I0a608654cdf67f3a56d0b8894f5458d212cb59d7
2018-04-12 07:28:04 +00:00
Jeff Sharkey
d43f738892 Merge "APIs to disable data usage notifications." into pi-dev
am: d6e54408bd

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
TreeHugger Robot
d6e54408bd Merge "APIs to disable data usage notifications." into pi-dev 2018-04-11 23:05:03 +00:00
Jeff Sharkey
7403f8207b 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
android-build-team Robot
8f0925f807 Snap for 4713750 from 5f91d5ee942ed2af54349a2a78f635237a84dbb4 to pi-release
Change-Id: Idee2cec3cc7637085e818931fee6048f005a5a94
2018-04-11 07:23:40 +00:00
Pavel Maltsev
7b0fb3fa55 Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev
am: d5b916a0a8

Change-Id: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
2018-04-10 20:58:01 -07:00
Remi NGUYEN VAN
55c1d94234 Merge "Added tests for MultipathPolicyTracker." into pi-dev
am: 36483a9f2e

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

Change-Id: I1410526ef303ba6e69b32a76db534f0ca59840ed
2018-04-10 00:51:28 -07:00
TreeHugger Robot
4a622fb929 Merge "Trigger NetworkCallback events when private DNS usage has changed." into pi-dev 2018-04-10 07:38:21 +00:00
android-build-team Robot
311ef1b547 Snap for 4710485 from d4a95a168974bf4052f63b9925de9594be684d66 to pi-release
Change-Id: I240679b58fa328769ae8e0240bcf53676a489ade
2018-04-10 07:27:46 +00:00
Remi NGUYEN VAN
b136bfd8eb 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