Commit Graph

1765 Commits

Author SHA1 Message Date
Lorenzo Colitti
a8a5ea3416 Merge "Support connecting to networks with misconfigured subnet masks." automerge: bd01ceb automerge: fb69689
automerge: 4137d5f

* commit '4137d5fd3ec8bd1dfb898fd92307db81c3648b3c':
  Support connecting to networks with misconfigured subnet masks.
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
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
Lorenzo Colitti
6c1da05211 am 50f9d93a: am 68c9c5aa: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
automerge: 7325a9d

* commit '7325a9da748e0d02301a071ec73bcc33acf79d7f':
  Support connecting to networks with misconfigured subnet masks.
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
Erik Kline
2530cf6f9f Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 3891c36 automerge: 4f36150
automerge: e806ea0

* commit 'e806ea09db2b1c62fa1bf6a58b1a0444b39bb1c0':
  Log interface name and uid when filtering a blocked network.
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

* commit '5caef4eca40f829edec17fde26ce787453caa7e4':
  Fix legacy request removal.
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
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
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
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.

bug:18826162
Change-Id: I7bb4b99ec969099e9815f46d4c09253be71a29be
2015-01-08 10:49:34 -05: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
Narayan Kamath
aa29a5ca4d am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
automerge: 5e73d17

* commit '5e73d1799f86983d2c2bc0db09a991f8b8697e22':
  Remove hardcoded include paths.
2014-12-31 10:21:39 +00:00
Narayan Kamath
5e73d1799f am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
  Remove hardcoded include paths.
2014-12-31 10:19:00 +00:00
Narayan Kamath
0620227e62 Remove hardcoded include paths.
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
2014-12-31 10:06:51 +00:00
Robert Greenwalt
39e1340649 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
automerge: 8ed2ad1

* commit '8ed2ad1c504137f045ba2d9c7172441dff346b79':
  Fix timing between bcast and net setup.
2014-12-26 20:36:43 +00:00
Robert Greenwalt
8ed2ad1c50 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
  Fix timing between bcast and net setup.
2014-12-26 20:30:32 +00:00
Robert Greenwalt
70116ce13c Fix timing between bcast and net setup.
A legacy network type request would generate a bcast before the network
notification was sent - the legacy startUsingNetworkFeature API requires
the notification so it can bind your dns queries to the new network.
Fast-moving clients could try to use the network before it was ready.

bug:18792871
Change-Id: I24c46ef15c249c50bfc321f62756d1f66dc3a6a9
2014-12-19 11:54:27 -08:00
Lorenzo Colitti
dcbc8811af am 7e81cdef: am 5f82daec: Add a lastValidated bit and use it when reporting capabilities.
automerge: 71860bbb

* commit '71860bbba756c618e0c8e19191b6d829e51d7f0a':
  Add a lastValidated bit and use it when reporting capabilities.
2014-12-19 10:51:18 +00:00
Lorenzo Colitti
5b4d1d0332 am b069e434: am a8de5ca5: Rename validated to everValidated.
automerge: aa48e8f

* commit 'aa48e8f77e24346afa0d8212e7fed91d4c8710c4':
  Rename validated to everValidated.
2014-12-19 10:49:24 +00:00
Lorenzo Colitti
71860bbba7 am 7e81cdef: am 5f82daec: Add a lastValidated bit and use it when reporting capabilities.
* commit '7e81cdef3625b52642969dd226a1446745e633e8':
  Add a lastValidated bit and use it when reporting capabilities.
2014-12-19 10:47:26 +00:00
Lorenzo Colitti
aa48e8f77e am b069e434: am a8de5ca5: Rename validated to everValidated.
* commit 'b069e434cba6dd8f949c3ebe44507da32aef3496':
  Rename validated to everValidated.
2014-12-19 10:47:20 +00:00
Lorenzo Colitti
5f82daecad Add a lastValidated bit and use it when reporting capabilities.
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.

Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().

Bug: 18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
2014-12-19 19:10:42 +09:00
Lorenzo Colitti
a8de5ca5cc Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.

Bug: 18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
2014-12-19 19:10:42 +09:00
Paul Jensen
9edd2acd0a am 32b6f2aa: am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '32b6f2aa5f2ac1a0bf1e360cd3006e745ccdca92':
  Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:11:21 +00:00
Paul Jensen
32b6f2aa5f am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
  Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:05:39 +00:00
Paul Jensen
0353fe5d99 Fix race between CONNECTIVITY_ACTION and setting default network.
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
2014-12-15 15:20:30 -05:00
Paul Jensen
62911488e9 am 7a0d9799: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
automerge: d6524c4

* commit 'd6524c4eb5034187bf03bf04e453499df32e3b08':
  Fix several HTTP proxy issues with multinetworking.
2014-12-11 10:25:47 +00:00
Paul Jensen
d6524c4eb5 am 7a0d9799: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
2014-12-11 05:49:18 +00:00
Paul Jensen
7a0d9799c8 Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Erik Kline
334d819b68 am e1bf37a8: am 63aba09c: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f
* commit 'e1bf37a85ee954c269bee2253b8e2a70fbd8e03e':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 21:58:42 +00:00
Paul Jensen
c0618a69f1 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
e1bf37a85e am 63aba09c: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
automerge: 56d2e8f

* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 19:06:50 +00:00
Erik Kline
63aba09c17 Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00