Lorenzo Colitti
489eb043d7
Make getNetworkInfo() take into account VPN underlying networks.
...
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug: 19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
2015-02-11 10:21:01 +09:00
The Android Automerger
7084717f11
merge in master-release history after reset to master
2015-02-07 02:04:50 -08:00
Lorenzo Colitti
c901766a37
am 9fa0471a: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
...
* commit '9fa0471a1577ef3008575a01bb84cbc8fad5138f':
Add a unit test for StaticIpConfiguration.
2015-02-05 02:41:31 +00:00
Lorenzo Colitti
9fa0471a15
am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
...
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
Add a unit test for StaticIpConfiguration.
2015-02-05 02:31:40 +00:00
Lorenzo Colitti
003133f82d
Add a unit test for StaticIpConfiguration.
...
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
2015-02-04 17:28:35 +09:00
The Android Automerger
128a9d5fa8
merge in master-release history after reset to master
2015-01-31 05:52:31 -08:00
Lorenzo Colitti
d2147882c6
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c40bd27 automerge: 5b392ee
...
automerge: 792622f
2015-01-30 15:59:49 +00:00
Lorenzo Colitti
42c7ff127e
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: c0e636a automerge: 786deba
...
automerge: bac1485
2015-01-30 15:58:39 +00:00
Lorenzo Colitti
792622f754
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c40bd27
...
automerge: 5b392ee
* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:56:00 +00:00
Lorenzo Colitti
bac14852ef
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: c0e636a
...
automerge: 786deba
* commit '786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
2015-01-30 15:54:45 +00:00
Lorenzo Colitti
c40bd27e25
Merge "Also include the domain when parceling StaticIpConfiguration."
2015-01-30 07:07:49 +00:00
Lorenzo Colitti
c0e636aae7
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
2015-01-30 07:00:38 +00:00
Lorenzo Colitti
68a1a34ec0
Also include the domain when parceling StaticIpConfiguration.
...
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.
Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
2015-01-29 12:20:55 +00:00
Lorenzo Colitti
a8a5ea3416
Merge "Support connecting to networks with misconfigured subnet masks." automerge: bd01ceb automerge: fb69689
...
automerge: 4137d5f
2015-01-29 08:46:07 +00:00
Lorenzo Colitti
4137d5fd3e
Merge "Support connecting to networks with misconfigured subnet masks." automerge: bd01ceb
...
automerge: fb69689
* commit 'fb696894ee24ffee3135f4bc460afa84f23efaeb':
Support connecting to networks with misconfigured subnet masks.
2015-01-29 08:42:18 +00:00
Lorenzo Colitti
bd01cebdd4
Merge "Support connecting to networks with misconfigured subnet masks."
2015-01-29 08:35:36 +00:00
Paul Jensen
99366a8aa4
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
...
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.
(cherry picked from commit c53113b37f33c7ed19660c8ec5bfd578e8bb5409)
bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
2015-01-29 17:12:35 +09:00
Lorenzo Colitti
c915d4c83d
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
(cherry picked from commit 2dfb79a54adeb4bcf1f62332a9db467fce302ced)
Change-Id: I80088f291466dbd5a47f360dcc1620acee5cf57e
2015-01-28 20:36:37 +09:00
The Android Automerger
6d9bf8f500
merge in master-release history after reset to master
2015-01-24 05:52:50 -08:00
Lorenzo Colitti
6c1da05211
am 50f9d93a: am 68c9c5aa: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 7325a9d
2015-01-23 13:05:26 +00:00
Lorenzo Colitti
7325a9da74
am 50f9d93a: am 68c9c5aa: 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
68c9c5aaff
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2015-01-23 12:50:32 +00:00
Lorenzo Colitti
64f1689c81
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
The Android Automerger
bbfaaf4a9c
merge in master-release history after reset to master
2015-01-22 05:52:22 -08:00
Erik Kline
2530cf6f9f
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 3891c36 automerge: 4f36150
...
automerge: e806ea0
2015-01-22 07:22:19 +00:00
Erik Kline
e806ea09db
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 3891c36
...
automerge: 4f36150
* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
Log interface name and uid when filtering a blocked network.
2015-01-22 07:18:00 +00:00
Erik Kline
3891c36428
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
2015-01-22 07:07:36 +00:00
Robert Greenwalt
7b67b739ea
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40
...
automerge: 5caef4e
2015-01-22 00:10:54 +00:00
Robert Greenwalt
5caef4eca4
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
...
automerge: 9e7cb40
* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
Fix legacy request removal.
2015-01-22 00:00:43 +00:00
The Android Automerger
9a421464f1
merge in master-release history after reset to master
2015-01-21 05:53:42 -08:00
Erik Kline
6cb03e349b
Log interface name and uid when filtering a blocked network.
...
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
2015-01-21 12:02:11 +09:00
Neil Fuller
7141623597
am 1c60d120: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
* commit '1c60d1208fa91abb8b69c3cd619ae400ebd1ca8b':
Changes associated with an OkHttp upgrade
2015-01-20 13:29:31 +00:00
Neil Fuller
1c60d1208f
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
c30362d9cf
Changes associated with an OkHttp upgrade
...
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
2015-01-20 11:59:24 +00:00
Robert Greenwalt
e8a912443a
Fix legacy request removal.
...
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.
bug:18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7
2015-01-16 16:06:39 -08:00
The Android Automerger
74083b47ad
merge in master-release history after reset to master
2015-01-15 05:52:34 -08:00
Jorim Jaggi
5b0d64f704
resolve merge conflicts of 87f5369 to master.
...
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
2015-01-15 00:12:18 +01:00
Paul Jensen
706f977c29
am be61ffa4: am 831fb40a: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
...
* commit 'be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
2015-01-14 19:24:09 +00:00
Paul Jensen
831fb40ae5
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
2015-01-14 12:39:01 +00:00
Paul Jensen
9e078d2f14
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
...
These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest. This change unifies the
is-this-network-needed code into a single function.
bug:18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c
2015-01-13 09:05:38 -05:00
The Android Automerger
6e26427237
merge in master-release history after reset to master
2015-01-10 05:53:10 -08:00
Paul Jensen
6287eb6962
am d2a3c85f: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e
...
* commit 'd2a3c85f1dc2cfa87e15628af227df58f4dcff89':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:15:17 +00:00
Paul Jensen
d2a3c85f1d
am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
...
automerge: 63e2b8e
* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:08:59 +00:00
Paul Jensen
40e43de8d0
Remember to cancel lingering when a network again satsifies a NetworkRequest.
...
When WiFi's score drops and then comes back up we would previously linger
WiFi but forget to cancel the linger timeout, so 30s later WiFi would
unexpectedly tear down. This was not completely fixed in d5f5339
2015-01-08 10:49:34 -05:00
The Android Automerger
17d4ca0b94
merge in master-release history after reset to master
2015-01-07 05:53:47 -08:00
Paul Jensen
a18ea556e9
am 81af1e4f: am 6c93739f: am 49f74a38: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '81af1e4f390a4aedb49c1405f3ea8e1b27fadbfa':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 20:09:18 +00:00
Paul Jensen
81af1e4f39
am 6c93739f: am 49f74a38: 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
49f74a382b
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
The Android Automerger
95aa173d46
merge in master-release history after reset to master
2014-12-31 05:51:42 -08:00
Narayan Kamath
aa29a5ca4d
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
...
automerge: 5e73d17
2014-12-31 10:21:39 +00:00
