Lorenzo Colitti
98dd474f47
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 5c9546b
2015-01-23 13:05:26 +00:00
Lorenzo Colitti
5c9546b1da
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
2015-01-23 13:01:42 +00:00
Lorenzo Colitti
ae38596bcf
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a
Support connecting to networks with misconfigured subnet masks.
...
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
2015-01-23 21:10:34 +09:00
Lorenzo Colitti
e871f0176d
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
...
automerge: 6840ffa
2015-01-23 06:10:48 +00:00
Lorenzo Colitti
6840ffae67
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
...
automerge: fbaf6b3
2015-01-23 06:06:57 +00:00
Lorenzo Colitti
78d51c2292
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456
Use the proper IpPrefix and LinkAddress constructors in VPN code.
...
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.
Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Robert Greenwalt
bea29888c8
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev automerge: 0343e1a
...
automerge: 8379688
2015-01-22 00:09:28 +00:00
Robert Greenwalt
8379688475
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
automerge: 0343e1a
2015-01-21 23:59:09 +00:00
Neil Fuller
df8e59abe5
am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."
...
* commit '77e7f401161e778e7f06401ac72b132f5272d4e2':
Fix for broken docs build.
2015-01-20 15:35:50 +00:00
Neil Fuller
77e7f40116
am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."
...
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
Fix for broken docs build.
2015-01-20 15:29:55 +00:00
Neil Fuller
ae69120b0f
Fix for broken docs build.
...
Broken by commit 50a01d8960
2015-01-20 15:17:04 +00:00
Neil Fuller
4c7ddabefa
am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
* commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503':
Changes associated with an OkHttp upgrade
2015-01-20 13:29:31 +00:00
Neil Fuller
7014da74e8
resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
2015-01-20 13:21:58 +00:00
Neil Fuller
50a01d8960
Changes associated with an OkHttp upgrade
...
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
2015-01-20 11:59:24 +00:00
Robert Greenwalt
2ffe412b0e
Rerun entitlementcheck on sim change.
...
Only run if entitlement is needed and tethering is running.
bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
2015-01-14 16:55:38 -08:00
Paul Jensen
3e50161a6e
am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '932bfab9aaa58f116935eb0a1f22de49301724c4':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 20:09:18 +00:00
Paul Jensen
932bfab9aa
am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '6c93739f2f25c8afb77997165fa86be537df67a9':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 14:57:44 +00:00
Paul Jensen
9ffb53cb11
Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.
bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
2015-01-06 09:43:04 -05:00
Robert Greenwalt
6b58bc2ba2
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automerge: 911bcea
...
automerge: 46765a0
2014-12-11 18:15:07 +00:00
Robert Greenwalt
46765a0fbc
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
...
automerge: 911bcea
2014-12-11 18:07:53 +00:00
Robert Greenwalt
bde00a2b5c
Merge "Add toString in NetworkFactory." into lmp-mr1-dev
2014-12-11 16:59:13 +00:00
Paul Jensen
87dfb9ec25
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
...
automerge: 8f58207
2014-12-11 10:25:47 +00:00
Paul Jensen
8f58207319
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
automerge: d9d48cc
2014-12-11 05:49:18 +00:00
Paul Jensen
2122e14cca
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
2014-12-11 04:51:16 +00:00
Robert Greenwalt
6b746b5e14
Add toString in NetworkFactory.
...
Needed some additional logging to track down this bug
so add toString to capture the state.
bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
2014-12-10 19:04:50 -08:00
Erik Kline
0bf20bea81
am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f
...
* commit '34b3b53f9c21346282cb889363024fa4c7bb558d':
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 21:58:42 +00:00
Paul Jensen
e0bef71662
Fix several HTTP proxy issues with multinetworking.
...
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
not just the default network.
2. When a process is bound to a particular Network, update the proxy
system properties to those for the bound Network, and keep them
updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.
bug:17905627
bug:17420465
bug:18144582
(cherry-pick of https://android-review.googlesource.com/#/c/115170 )
Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05:00
Erik Kline
34b3b53f9c
am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
automerge: 56d2e8f
2014-12-10 19:06:50 +00:00
Erik Kline
33cd463bbb
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
2014-12-10 07:29:47 +00:00
Wink Saville
189c180857
am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
Add subId as parameter for get/setDataEnabled.
2014-12-09 23:47:19 +00:00
Elliott Hughes
de472a53ac
am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo."
...
* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
Fix typo.
2014-12-09 23:46:44 +00:00
Jeff Sharkey
dc460d3512
am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
...
* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
Direct notification of network interface changes.
2014-12-09 23:20:26 +00:00
Jeff Sharkey
a9f6048a94
am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
Offer to "merge" subscribers for data usage.
2014-12-09 22:23:19 +00:00
Elliott Hughes
0aac16bbf1
am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
2014-12-09 21:34:06 +00:00
Elliott Hughes
b034de7eef
am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit '12f100def9e34a554df07f47badc259028ac4c68':
Fix typo.
2014-12-09 19:30:26 +00:00
Elliott Hughes
547b0acae1
Fix typo.
...
Bug: https://code.google.com/p/android/issues/detail?id=78422
(cherry picked from commit 0adcf15ad8
2014-12-09 10:31:37 -08:00
Wink Saville
7a4df2b7d8
am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
2014-12-09 18:06:03 +00:00
Wink Saville
15b29ac7fa
Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
2014-12-09 17:52:27 +00:00
Elliott Hughes
d50a5e7486
am afc5b22c: am da30b545: Merge "Fix typo."
...
* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
Fix typo.
2014-12-09 16:17:34 +00:00
Elliott Hughes
0adcf15ad8
Fix typo.
...
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
2014-12-08 20:50:00 -08:00
Pavel Zhamaitsiak
0cec63a283
am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-09 00:18:39 +00:00
Jeff Sharkey
ea06d6ceb7
am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
...
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
Direct notification of network interface changes.
2014-12-09 00:18:01 +00:00
Jeff Sharkey
6973634ce6
Direct notification of network interface changes.
...
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes. For example, when stacked network
interfaces change for a mobile network. To ensure that we pick up
all these details, directly wire the two services together.
Also remove some unused code for split network types.
Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Jeff Sharkey
d5b5576dd6
am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
Pavel Zhamaitsiak
913c989546
am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-08 19:16:43 +00:00
Jeff Sharkey
3256601f5e
Offer to "merge" subscribers for data usage.
...
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective. This is done by extending the template used for
matching purposes to support multiple subscribers.
Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included. When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.
This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface. Also correctly create default policies for multi-SIM
devices. This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent. (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)
Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Erik Kline
8f29dcfb53
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
...
Since optimistic addresses are useable upon kernel notification
there is no need for this extra connectivity delay.
---
This functionality was originally submitted in ag/572619. Owing
to issues with bind()ing to optimistic addresses (see b/18609055)
this was reverted in ag/598673.
This reverts the revert. :-)
Bug: 17769720
Change-Id: Ibee490b2af72050693b6bd748193f51e312ca527
2014-12-08 16:25:20 +09:00
Wink Saville
36ffb0494d
Add subId as parameter for get/setDataEnabled.
...
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
2014-12-05 11:10:30 -08:00
